Changeset 9db0567 in git

Timestamp:

Sep 10, 2008, 10:52:57 AM (16 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

88d6313369cd3bc8cb8a65fa06a77e2f9a81dd0a

Parents:

22b066b77493b235888cee08afa10eadcb851a32

Message:

*hannes: gcc 4 fixes


git-svn-id: file:///usr/local/Singular/svn/trunk@11039 2c84dea3-7e68-4137-9b89-c4e89433aadc

Files:

• Singular/fehelp.cc (modified) (5 diffs)
• Singular/silink.cc (modified) (3 diffs)
• Singular/silink.h (modified) (3 diffs)
• kernel/febase.h (modified) (2 diffs)

Singular/fehelp.cc

@@ -4 +4 @@
 /*
 * ABSTRACT: help system
-* versin $Id: fehelp.cc,v 1.52 2008-03-18 17:31:50 Singular Exp $
+* versin $Id: fehelp.cc,v 1.53 2008-09-10 08:52:56 Singular Exp $
 */
 
@@ -45 +45 @@
 typedef struct
 {
-  char* browser;
+  const char* browser;
   heBrowserInitProc init_proc;
   heBrowserHelpProc help_proc;
-  char* required;
-  char* action;
+  const char* required;
+  const char* action;
 } heBrowser_s;
 typedef heBrowser_s * heBrowser;
@@ -318 +318 @@
 }
 
-char* feHelpBrowser(char* which, int warn)
+const char* feHelpBrowser(char* which, int warn)
 {
   int i = 0;
@@ -891 +891 @@
 {
   if (heHelpBrowsers[br].required==NULL) return TRUE;
-  char *p=heHelpBrowsers[br].required;
+  const char *p=heHelpBrowsers[br].required;
   while (*p>'\0')
   {
@@ -997 +997 @@
   char sys[MAX_SYSCMD_LEN];
   char url[MAXPATHLEN];
-  char *p=heHelpBrowsers[br].action;
+  const char *p=heHelpBrowsers[br].action;
   if (p==NULL) {PrintS("no action ?\n"); return;}
   memset(sys,0,MAX_SYSCMD_LEN);

Singular/silink.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: silink.cc,v 1.47 2008-03-19 17:44:37 Singular Exp $ */
+/* $Id: silink.cc,v 1.48 2008-09-10 08:52:57 Singular Exp $ */
 
 /*
@@ -153 +153 @@
 }
 
-const char* slStatus(si_link l, char *request)
+const char* slStatus(si_link l, const char *request)
 {
   if (l == NULL) return "empty link";
@@ -520 +520 @@
 }
 
-const char* slStatusAscii(si_link l, char* request)
+const char* slStatusAscii(si_link l, const char* request)
 {
   if (strcmp(request, "read") == 0)

Singular/silink.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: silink.h,v 1.17 2008-04-01 17:32:36 wienand Exp $ */
+/* $Id: silink.h,v 1.18 2008-09-10 08:52:57 Singular Exp $ */
 /*
 * ABSTRACT: general interface to links
@@ -20 +20 @@
 typedef BOOLEAN    (*slDumpProc)(si_link l);
 typedef BOOLEAN    (*slGetDumpProc)(si_link l);
-typedef const char* (*slStatusProc)(si_link l, char *request);
+typedef const char* (*slStatusProc)(si_link l, const char *request);
 
 struct s_si_link_extension
@@ -72 +72 @@
 BOOLEAN slDump(si_link l);
 BOOLEAN slGetDump(si_link l);
-const char* slStatus(si_link l, char *request);
-const char* slStatusAscii(si_link l, char* request);
+const char* slStatus(si_link l, const char *request);
+const char* slStatusAscii(si_link l,const  char* request);
 BOOLEAN slInit(si_link l, char *str);
 void slKill(si_link l);

kernel/febase.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: febase.h,v 1.11 2008-08-18 10:39:03 Singular Exp $ */
+/* $Id: febase.h,v 1.12 2008-09-10 08:52:27 Singular Exp $ */
 /*
 * ABSTRACT: basic i/o
@@ -191 +191 @@
 // keeps feOpt("browser") up-to-date
 // Optional warn argument is as in feResource
-char* feHelpBrowser(char* browser = NULL, int warn = -1);
+const char* feHelpBrowser(char* browser = NULL, int warn = -1);
 void feStringAppendBrowsers(int warn = -1);