Changeset a0db9e in git

Timestamp:

Jan 15, 2010, 4:14:23 PM (13 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

07969dccf755f67630fa12e66b48f62a2a7ba76d

Parents:

bf3f332d4e29104e80aaf5520f04b6d65789298a

Message:

more const in MP stuff

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

Files:

• MP/MP/MP.h (modified) (3 diffs)
• MP/MP/MP_Link.c (modified) (1 diff)
• MP/MP/MP_Util.c (modified) (1 diff)
• MP/MP/h/MP_Link.h (modified) (1 diff)
• MP/MP/h/MP_TcpTransp.h (modified) (1 diff)
• MP/MP/h/MP_Util.h (modified) (1 diff)
• Singular/mpsr_sl.cc (modified) (5 diffs)

MP/MP/MP.h

@@ -867 +867 @@
 
 EXTERN MP_Link_pt MP_OpenLink _ANSI_ARGS_((MP_Env_pt env, int argc,
-                                             char **argv));
+                                             const char **argv));
 
 EXTERN void MP_CloseLink _ANSI_ARGS_((MP_Link_pt link));
@@ -994 +994 @@
 EXTERN char* MP_StatusErrorStr _ANSI_ARGS_((MP_Link_pt link, MP_Status_t status));
 
-EXTERN char *IMP_GetCmdlineArg _ANSI_ARGS_((int argc, char **argv, char *cmd));
+EXTERN char *IMP_GetCmdlineArg _ANSI_ARGS_((int argc, char **argv, const char *cmd));
 
 EXTERN char *IMP_TypeToString  _ANSI_ARGS_((MP_NodeType_t t));
@@ -1465 +1465 @@
 MP_Status_t socket_accept_blocking _ANSI_ARGS_((MP_Link_pt, SOCKET*));
 MP_Status_t socket_accept_non_blocking _ANSI_ARGS_((MP_Link_pt, SOCKET*));
-char* IMP_GetCmdlineArg _ANSI_ARGS_((int, char**, char*));
+char* IMP_GetCmdlineArg _ANSI_ARGS_((int, char**, const char*));
 
 

MP/MP/MP_Link.c

@@ -194 +194 @@
 
 #ifdef __STDC__
-MP_Link_pt MP_OpenLink(MP_Env_pt env, int argc, char **argv)
+MP_Link_pt MP_OpenLink(MP_Env_pt env, int argc, const char **argv)
 #else
 MP_Link_pt MP_OpenLink(env, argc, argv)

MP/MP/MP_Util.c

@@ -211 +211 @@
 char* IMP_GetCmdlineArg(int argc,
                         char **argv,
-                        char *cmd)
+                        const char *cmd)
 #else
 char* IMP_GetCmdlineArg(argc, argv, cmd)

MP/MP/h/MP_Link.h

@@ -91 +91 @@
 
 EXTERN MP_Link_pt MP_OpenLink _ANSI_ARGS_((MP_Env_pt env, int argc,
-                                             char **argv));
+                                             const char **argv));
 
 EXTERN void MP_CloseLink _ANSI_ARGS_((MP_Link_pt link));

MP/MP/h/MP_TcpTransp.h

@@ -87 +87 @@
 MP_Status_t socket_accept_blocking _ANSI_ARGS_((MP_Link_pt, SOCKET*));
 MP_Status_t socket_accept_non_blocking _ANSI_ARGS_((MP_Link_pt, SOCKET*));
-char* IMP_GetCmdlineArg _ANSI_ARGS_((int, char**, char*));
+char* IMP_GetCmdlineArg _ANSI_ARGS_((int, char**, const char*));
 
 

MP/MP/h/MP_Util.h

@@ -52 +52 @@
 EXTERN char* MP_StatusErrorStr _ANSI_ARGS_((MP_Link_pt link, MP_Status_t status));
 
-EXTERN char *IMP_GetCmdlineArg _ANSI_ARGS_((int argc, char **argv, char *cmd));
+EXTERN char *IMP_GetCmdlineArg _ANSI_ARGS_((int argc, char **argv, const char *cmd));
 
 EXTERN char *IMP_TypeToString  _ANSI_ARGS_((MP_NodeType_t t));

Singular/mpsr_sl.cc

@@ -118 +118 @@
 LINKAGE BOOLEAN slOpenMPFile(si_link l, short flag)
 {
-  char *argv[] = {"--MPtransp", "FILE", "--MPmode", "append",
-                  "--MPfile", "/tmp/mpout"};
-  char *mode;
+  const char *argv[] = {"--MPtransp", "FILE", "--MPmode", "append",
+                        "--MPfile", "/tmp/mpout"};
+  const char *mode;
 
   MP_Link_pt link = NULL;
@@ -180 +180 @@
 LINKAGE MP_Link_pt slOpenMPConnect(int n_argc, char **n_argv)
 {
-  char *argv[] = {"--MPtransp", "TCP", "--MPmode", "connect", "--MPport",
-                  "1025",  "--MPhost", "localhost","--MPrsh","ssh"};
-
-  char *port = IMP_GetCmdlineArg(n_argc, n_argv, "--MPport");
-  char *host = IMP_GetCmdlineArg(n_argc, n_argv, "--MPhost");
-  char *rsh = IMP_GetCmdlineArg(n_argc, n_argv, "--MPrsh");
+  const char *argv[] = {"--MPtransp", "TCP", "--MPmode", "connect", "--MPport",
+                       "1025",  "--MPhost", "localhost","--MPrsh","ssh"};
+
+  const char *port = IMP_GetCmdlineArg(n_argc, n_argv, "--MPport");
+  const char *host = IMP_GetCmdlineArg(n_argc, n_argv, "--MPhost");
+  const char *rsh = IMP_GetCmdlineArg(n_argc, n_argv, "--MPrsh");
 
   if (port == NULL) port = (char*) feOptValue(FE_OPT_MPPORT);
@@ -205 +205 @@
 LINKAGE MP_Link_pt slOpenMPListen(int n_argc, char **n_argv)
 {
-  char *argv[] = {"--MPtransp", "TCP", "--MPmode", "listen",
-                  "--MPport", "1025"};
+  const char *argv[] = {"--MPtransp", "TCP", "--MPmode", "listen",
+                       "--MPport", "1025"};
   char *port = IMP_GetCmdlineArg(n_argc, n_argv, "--MPport");
 
@@ -218 +218 @@
 MP_Link_pt slOpenMPLaunch(int n_argc, char **n_argv)
 {
-  char *argv[] = {"--MPtransp", "TCP", "--MPmode", "launch",
-                  "--MPhost", "localhost",
-                  "--MPapplication", "Singular -bq  --no-warn --no-out --no-rc",
-                  "--MPrsh", "rsh"};
-  char *appl = IMP_GetCmdlineArg(n_argc, n_argv, "--MPapplication");
-  char *host = IMP_GetCmdlineArg(n_argc, n_argv, "--MPhost");
-  char *rsh = IMP_GetCmdlineArg(n_argc, n_argv, "--MPrsh");
+  const char *argv[] = {"--MPtransp", "TCP", "--MPmode", "launch",
+                       "--MPhost", "localhost",
+                       "--MPapplication", "Singular -bq  --no-warn --no-out --no-rc",
+                       "--MPrsh", "rsh"};
+  const char *appl = IMP_GetCmdlineArg(n_argc, n_argv, "--MPapplication");
+  const char *host = IMP_GetCmdlineArg(n_argc, n_argv, "--MPhost");
+  const char *rsh = IMP_GetCmdlineArg(n_argc, n_argv, "--MPrsh");
   char* nappl = NULL;
   MP_Link_pt link;
@@ -268 +268 @@
 {
   MP_Link_pt link = NULL;
-  char *argv[] = {"--MPtransp", "TCP", "--MPmode", "fork", "--MPport", "1703"};
+  const char *argv[] = {"--MPtransp", "TCP", "--MPmode", "fork", "--MPport", "1703"};
   char *port = IMP_GetCmdlineArg(n_argc, n_argv, (char *)"--MPport");