Changeset a3600c in git


Ignore:
Timestamp:
Apr 9, 1999, 2:14:56 PM (25 years ago)
Author:
Hans Schönemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '0bc2210f8055033868008a3836878db65ec6f89e')
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:
8 edited

Legend:

Unmodified
Added
Removed
  • MP/MP/MP.h

    rdda550 ra3600c  
    809809{
    810810    int               link_id;
    811     int               errno;
     811    int               MP_errno;
    812812    MP_Env_pt         env;
    813813    MP_Transport_t    transp;
     
    986986                                            MP_Status_t the_err));
    987987
    988 #define MP_ClearError(link) ((MP_Status_t) (link)->errno = MP_Success)
     988#define MP_ClearError(link) ((MP_Status_t) (link)->MP_errno = MP_Success)
    989989
    990990EXTERN void MP_PrintError _ANSI_ARGS_((MP_Link_pt link));
  • MP/MP/MP_Link.c

    rdda550 ra3600c  
    139139
    140140#ifndef lint
    141 static char vcid[] = "@(#) $Id: MP_Link.c,v 1.4 1998-10-14 16:44:38 obachman Exp $";
     141static char vcid[] = "@(#) $Id: MP_Link.c,v 1.5 1999-04-09 12:14:52 Singular Exp $";
    142142#endif /* lint */
    143143
     
    261261    }
    262262
    263     link->errno       = MP_Success;
     263    link->MP_errno    = MP_Success;
    264264    link->logmask     = MP_LOG_INIT_EVENTS;
    265265    link->num_o_buff  = counter;
  • MP/MP/MP_Util.c

    rdda550 ra3600c  
    3838
    3939#ifndef lint
    40 static char vcid[] = "@(#) $Id: MP_Util.c,v 1.4 1998-10-14 16:44:39 obachman Exp $";
     40static char vcid[] = "@(#) $Id: MP_Util.c,v 1.5 1999-04-09 12:14:52 Singular Exp $";
    4141#endif /* lint */
    4242
     
    114114#endif
    115115{
    116     link->errno = the_err;
     116    link->MP_errno = the_err;
    117117    if (the_err != MP_Failure && the_err >= 0 && the_err < MP_MaxError)
    118118        MP_LogEvent(link, MP_ERROR_EVENT, MP_errlist[the_err]);
    119119    else {
    120         sprintf(fix_log_msg, "Unknown error number %d", link->errno);
     120        sprintf(fix_log_msg, "Unknown error number %d", link->MP_errno);
    121121        MP_LogEvent(link, MP_ERROR_EVENT, fix_log_msg);
    122122    }
     
    134134#endif
    135135{
    136    return (link->errno = MP_Success);
     136   return (link->MP_errno = MP_Success);
    137137}
    138138*/
     
    146146#endif
    147147{
    148     if (link->errno >= 0 && link->errno < MP_MaxError) {
    149         fprintf(stderr, "\nMP ERROR: %s\n", MP_errlist[link->errno]);
     148    if (link->MP_errno >= 0 && link->MP_errno < MP_MaxError) {
     149        fprintf(stderr, "\nMP ERROR: %s\n", MP_errlist[link->MP_errno]);
    150150        fflush(stderr);
    151151    } else
    152         fprintf(stderr, "MP: Unknown error number %d\n", link->errno);
     152        fprintf(stderr, "MP: Unknown error number %d\n", link->MP_errno);
    153153}
    154154
     
    161161#endif
    162162{
    163   if (link->errno >= 0 && link->errno < MP_MaxError)
    164     return MP_errlist[link->errno];
     163  if (link->MP_errno >= 0 && link->MP_errno < MP_MaxError)
     164    return MP_errlist[link->MP_errno];
    165165  else
    166166    return "MP: Unknown error number";
     
    176176#endif
    177177{
    178   if (link->errno != MP_Success && link->errno != MP_Failure
    179       && link->errno < MP_MaxError && link->errno >= 0)
     178  if (link->MP_errno != MP_Success && link->MP_errno != MP_Failure
     179      && link->MP_errno < MP_MaxError && link->MP_errno >= 0)
    180180    return MP_ErrorStr(link);
    181181  if (status != MP_Success && status != MP_Failure &&
     
    183183    return MP_errlist[status];
    184184 
    185   if (status == MP_Failure || link->errno == MP_Failure)
     185  if (status == MP_Failure || link->MP_errno == MP_Failure)
    186186    return MP_errlist[MP_Failure];
    187187
    188   if (status == MP_Success && link->errno == MP_Success)
     188  if (status == MP_Success && link->MP_errno == MP_Success)
    189189    return MP_errlist[MP_Success];
    190190 
  • MP/MP/h/MP_Link.h

    rdda550 ra3600c  
    3333{
    3434    int               link_id;
    35     int               errno;
     35    int               MP_errno;
    3636    MP_Env_pt         env;
    3737    MP_Transport_t    transp;
  • MP/MP/h/MP_Util.h

    rdda550 ra3600c  
    4444                                            MP_Status_t the_err));
    4545
    46 #define MP_ClearError(link) ((MP_Status_t) (link)->errno = MP_Success)
     46#define MP_ClearError(link) ((MP_Status_t) (link)->MP_errno = MP_Success)
    4747
    4848EXTERN void MP_PrintError _ANSI_ARGS_((MP_Link_pt link));
  • MP/MPT/MPT_Error.cc

    rdda550 ra3600c  
    4949{
    5050  if (error == MPT_MP_Failure &&
    51       link != NULL && link->errno >= 0 && link->errno != MP_Success)
     51      link != NULL && link->MP_errno >= 0 && link->MP_errno != MP_Success)
    5252    return MP_ErrorStr(link);
    5353 
  • Singular/misc.cc

    rdda550 ra3600c  
    319319
    320320  while(!feof(index)
    321         && *fgets(buffer, BUF_LEN, index) != EOF
     321        && fgets(buffer, BUF_LEN, index) != (char *)0
    322322        && buffer[0] != FIN_INDEX);
    323323
  • Singular/mpsr_Error.cc

    rdda550 ra3600c  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: mpsr_Error.cc,v 1.6 1999-03-08 17:30:44 Singular Exp $ */
     4/* $Id: mpsr_Error.cc,v 1.7 1999-04-09 12:14:56 Singular Exp $ */
    55
    66/***************************************************************
     
    5454{
    5555  mpsr_SetError(mpsr_MP_Failure);
    56   mpsr_MP_errno = link->errno;
     56  mpsr_MP_errno = link->MP_errno;
    5757  return mpsr_MP_Failure;
    5858}
Note: See TracChangeset for help on using the changeset viewer.