Changeset ae030d in git

Timestamp:

Feb 3, 2012, 5:08:54 PM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

c2e8c5044ea364ea7100d35065206c3d3258f96a

Parents:

951db29edc9cda82b668de29b5733c1ca8ed44b6

Message:

removed depencies on omalloc from feResource

Files:

• findexec/omFindExec.c (modified) (3 diffs)
• libpolys/resources/feFopen.cc (modified) (4 diffs)
• libpolys/resources/feResource.cc (modified) (15 diffs)

findexec/omFindExec.c

@@ -24 +24 @@
 #endif
 
-#ifdef WINNT
-#include <omalloc/omalloc.h>
-#endif
-
 /* ABSOLUTE_FILENAME_P (fname): True if fname is an absolute filename */
 #define ABSOLUTE_FILENAME_P(fname)        (fname[0] == '/')
@@ -94 +90 @@
       char *extra = NULL;
       /* we are under msdos display */
-      extra = (char*) omAlloc((search != NULL ? strlen(search) : 0) + 3);
+      extra = (char*) malloc((search != NULL ? strlen(search) : 0) + 3);
       strcpy(extra, ".:");
       if (search != NULL) strcat(extra, search);
@@ -134 +130 @@
 #ifdef WINNT
           if (extra != NULL)
-            omFree(extra);
+            free(extra);
 #endif
           strcpy(executable, tbuf);

libpolys/resources/feFopen.cc

@@ -9 +9 @@
 #include <misc/auxiliary.h>
 
-#include <omalloc/omalloc.h>
 #include <reporter/reporter.h>
 
@@ -85 +84 @@
     char *s;
 
-    if (where==NULL) s=(char *)omAlloc(250 * sizeof(char));
+    if (where==NULL) s=(char *)malloc(1024);
     else             s=where;
 
@@ -111 +110 @@
       if (f!=NULL)
       {
-        if (where==NULL) omFree((ADDRESS)s);
+        if (where==NULL) free((ADDRESS)s);
         return f;
       }
@@ -120 +119 @@
       f=myfopen(path,mode);
     }
-    if (where==NULL) omFree((ADDRESS)s);
+    if (where==NULL) free((ADDRESS)s);
   }
   if ((f==NULL)&&(useWerror))

libpolys/resources/feResource.cc

@@ -19 +19 @@
 #include "feResource.h"
 
-char* feArgv0 = NULL; 
+char* feArgv0 = NULL;
 
 #ifdef AIX_4
@@ -31 +31 @@
 
 #include <reporter/reporter.h>
-#include <omalloc/omalloc.h>
 //char* feResource(const char id, int warn = -1);
 //char* feResource(const char* key, int warn = -1);
@@ -178 +177 @@
   if (argv0==NULL)
   {
-    feArgv0 = (char*)omAlloc0(MAXPATHLEN+strlen("/Singular"));
+    feArgv0 = (char*)malloc(MAXPATHLEN+strlen("/Singular"));
     getcwd(feArgv0, MAXPATHLEN);
     strcpy(feArgv0+strlen(feArgv0),"/Singular");
   }
   else
-    feArgv0 = omStrDup(argv0);
+    feArgv0 = strdup(argv0);
 #ifdef RESOURCE_DEBUG
   printf("feInitResources: entering with argv0=%s=\n", feArgv0);
@@ -199 +198 @@
 #endif
 #ifdef HAVE_PUTENV
-  if (path != NULL) { char *s=(char *)omAlloc0(strlen(path)+6);
+  if (path != NULL) { char *s=(char *)malloc(strlen(path)+6);
                       sprintf(s,"PATH=%s",path);
                       putenv(s);
@@ -217 +216 @@
     {
       if (feResourceConfigs[i].value != NULL)
-        omFree(feResourceConfigs[i].value);
+        free(feResourceConfigs[i].value);
       feResourceConfigs[i].value = (char *)"";
     }
@@ -270 +269 @@
 {
   if (config == NULL) return NULL;
-  char* value = (char*) omAlloc(MAXRESOURCELEN);
+  char* value = (char*) malloc(MAXRESOURCELEN);
   feSprintf(value, config->fmt, -1);
   return value;
@@ -302 +301 @@
         printf("feInitResource: Set value of %s to =%s=\n", config->key, value);
 #endif
-        config->value = omStrDup(value);
+        config->value = strdup(value);
         return config->value;
       }
@@ -322 +321 @@
       printf("value:%s\n", value);
 #endif
-      omFree(executable);
+      free(executable);
     }
   }
@@ -362 +361 @@
     printf("feInitResource: Set value of %s to =%s=\n", config->key, value);
 #endif
-    config->value = omStrDup(value);
+    config->value = strdup(value);
     return config->value;
   }
@@ -374 +373 @@
                                 feCleanResourceValue(config->type, value)))
       {
-        config->value = omStrDup(value);
+        config->value = strdup(value);
 #ifdef RESOURCE_DEBUG
         printf("feInitResource: Set value of %s to =%s=\n", config->key, config->value);
@@ -434 +433 @@
     return NULL;
   }
-  return omStrDup(value);
+  return strdup(value);
 }
 
@@ -519 +518 @@
         if (*(fn+2) == '.' && (*(fn + 3) == '/' || *(fn + 3) == '\0'))
         {
-        #if 0
-        // this does not work: ./../../mmm will be changed to ./../mmm
-        // but we only want to change ././mmm to ./mmm
+        #if 0
+        // this does not work: ./../../mmm will be changed to ./../mmm
+        // but we only want to change ././mmm to ./mmm
           *fn = '\0';
           s = strrchr(fname, '/');
@@ -533 +532 @@
             *fn = '/';
           }
-        #endif
+        #endif
         }
         else if (*(fn+2) == '/' || *(fn+2) == '\0')
@@ -572 +571 @@
   }
 
-  path_comps = (char**) omAlloc(n_comps*sizeof(char*));
+  path_comps = (char**) malloc(n_comps*sizeof(char*));
   path_comps[0]=opath;
   path=opath;
@@ -652 +651 @@
     *opath = '\0';
   }
-  omFree(path_comps);
+  free(path_comps);
 #ifdef RESOURCE_DEBUG
   Print("feCleanUpPath: leaving with path=%s=\n", opath);