Changeset a3600c in git

Timestamp:

Apr 9, 1999, 2:14:56 PM (24 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

81fb58d69996f43b36f242e32fa561907b220757

Parents:

dda55083d99d834e2bb04d41042afd9fee970586

Message:

* hannes: glibc-fixes: rename errno of an MP link to MP_errno


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

Files:

• MP/MP/MP.h (modified) (2 diffs)
• MP/MP/MP_Link.c (modified) (2 diffs)
• MP/MP/MP_Util.c (modified) (7 diffs)
• MP/MP/h/MP_Link.h (modified) (1 diff)
• MP/MP/h/MP_Util.h (modified) (1 diff)
• MP/MPT/MPT_Error.cc (modified) (1 diff)
• Singular/misc.cc (modified) (1 diff)
• Singular/mpsr_Error.cc (modified) (2 diffs)

MP/MP/MP.h

@@ -809 +809 @@
 {
     int               link_id;
-    int               errno;
+    int               MP_errno;
     MP_Env_pt         env;
     MP_Transport_t    transp;
@@ -986 +986 @@
                                             MP_Status_t the_err));
 
-#define MP_ClearError(link) ((MP_Status_t) (link)->errno = MP_Success)
+#define MP_ClearError(link) ((MP_Status_t) (link)->MP_errno = MP_Success)
 
 EXTERN void MP_PrintError _ANSI_ARGS_((MP_Link_pt link));

MP/MP/MP_Link.c

@@ -139 +139 @@
 
 #ifndef lint
-static char vcid[] = "@(#) $Id: MP_Link.c,v 1.4 1998-10-14 16:44:38 obachman Exp $";
+static char vcid[] = "@(#) $Id: MP_Link.c,v 1.5 1999-04-09 12:14:52 Singular Exp $";
 #endif /* lint */
 
@@ -261 +261 @@
     }
 
-    link->errno       = MP_Success;
+    link->MP_errno    = MP_Success;
     link->logmask     = MP_LOG_INIT_EVENTS;
     link->num_o_buff  = counter;

MP/MP/MP_Util.c

@@ -38 +38 @@
 
 #ifndef lint
-static char vcid[] = "@(#) $Id: MP_Util.c,v 1.4 1998-10-14 16:44:39 obachman Exp $";
+static char vcid[] = "@(#) $Id: MP_Util.c,v 1.5 1999-04-09 12:14:52 Singular Exp $";
 #endif /* lint */
 
@@ -114 +114 @@
 #endif
 {
-    link->errno = the_err;
+    link->MP_errno = the_err;
     if (the_err != MP_Failure && the_err >= 0 && the_err < MP_MaxError)
         MP_LogEvent(link, MP_ERROR_EVENT, MP_errlist[the_err]);
     else {
-        sprintf(fix_log_msg, "Unknown error number %d", link->errno);
+        sprintf(fix_log_msg, "Unknown error number %d", link->MP_errno);
         MP_LogEvent(link, MP_ERROR_EVENT, fix_log_msg);
     }
@@ -134 +134 @@
 #endif
 {
-   return (link->errno = MP_Success);
+   return (link->MP_errno = MP_Success);
 }
 */
@@ -146 +146 @@
 #endif
 {
-    if (link->errno >= 0 && link->errno < MP_MaxError) {
-        fprintf(stderr, "\nMP ERROR: %s\n", MP_errlist[link->errno]);
+    if (link->MP_errno >= 0 && link->MP_errno < MP_MaxError) {
+        fprintf(stderr, "\nMP ERROR: %s\n", MP_errlist[link->MP_errno]);
         fflush(stderr);
     } else
-        fprintf(stderr, "MP: Unknown error number %d\n", link->errno);
+        fprintf(stderr, "MP: Unknown error number %d\n", link->MP_errno);
 }
 
@@ -161 +161 @@
 #endif
 {
-  if (link->errno >= 0 && link->errno < MP_MaxError)
-    return MP_errlist[link->errno];
+  if (link->MP_errno >= 0 && link->MP_errno < MP_MaxError)
+    return MP_errlist[link->MP_errno];
   else
     return "MP: Unknown error number";
@@ -176 +176 @@
 #endif
 {
-  if (link->errno != MP_Success && link->errno != MP_Failure 
-      && link->errno < MP_MaxError && link->errno >= 0)
+  if (link->MP_errno != MP_Success && link->MP_errno != MP_Failure 
+      && link->MP_errno < MP_MaxError && link->MP_errno >= 0)
     return MP_ErrorStr(link);
   if (status != MP_Success && status != MP_Failure && 
@@ -183 +183 @@
     return MP_errlist[status];
   
-  if (status == MP_Failure || link->errno == MP_Failure)
+  if (status == MP_Failure || link->MP_errno == MP_Failure)
     return MP_errlist[MP_Failure];
 
-  if (status == MP_Success && link->errno == MP_Success)
+  if (status == MP_Success && link->MP_errno == MP_Success)
     return MP_errlist[MP_Success];
   

MP/MP/h/MP_Link.h

@@ -33 +33 @@
 {
     int               link_id;
-    int               errno;
+    int               MP_errno;
     MP_Env_pt         env;
     MP_Transport_t    transp;

MP/MP/h/MP_Util.h

@@ -44 +44 @@
                                             MP_Status_t the_err));
 
-#define MP_ClearError(link) ((MP_Status_t) (link)->errno = MP_Success)
+#define MP_ClearError(link) ((MP_Status_t) (link)->MP_errno = MP_Success)
 
 EXTERN void MP_PrintError _ANSI_ARGS_((MP_Link_pt link));

MP/MPT/MPT_Error.cc

@@ -49 +49 @@
 {
   if (error == MPT_MP_Failure &&
-      link != NULL && link->errno >= 0 && link->errno != MP_Success)
+      link != NULL && link->MP_errno >= 0 && link->MP_errno != MP_Success)
     return MP_ErrorStr(link);
   

Singular/misc.cc

@@ -319 +319 @@
 
   while(!feof(index)
-        && *fgets(buffer, BUF_LEN, index) != EOF
+        && fgets(buffer, BUF_LEN, index) != (char *)0
         && buffer[0] != FIN_INDEX);
 

Singular/mpsr_Error.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: mpsr_Error.cc,v 1.6 1999-03-08 17:30:44 Singular Exp $ */
+/* $Id: mpsr_Error.cc,v 1.7 1999-04-09 12:14:56 Singular Exp $ */
 
 /***************************************************************
@@ -54 +54 @@
 {
   mpsr_SetError(mpsr_MP_Failure);
-  mpsr_MP_errno = link->errno;
+  mpsr_MP_errno = link->MP_errno;
   return mpsr_MP_Failure;
 }