Changeset 147686 in git for Singular/feResource.cc

Timestamp:

Aug 16, 1999, 5:09:47 PM (25 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38077648e7239f98078663eb941c3c979511150a')

Children:

6459a5b234937bea2c13330e1323284c0a6aecc4

Parents:

9f18501ca0cfcfef1e9dd96f9104154c78199b96

Message:

* don't chatter about path stuff on ResourceInit


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

File:

• Singular/feResource.cc (modified) (9 diffs)

Singular/feResource.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: feResource.cc,v 1.6 1999-08-14 13:17:30 Singular Exp $ */
+/* $Id: feResource.cc,v 1.7 1999-08-16 15:09:47 obachman Exp $ */
 /*
 * ABSTRACT: management of resources
@@ -12 +12 @@
 #include "mmemory.h"
 #include "febase.h"
+#include "version.h"
 
 // define RESOURCE_DEBUG for chattering about resource management
@@ -110 +111 @@
 static char* feCleanUpPath(char* path);
 static void mystrcpy(char* d, char* s);
-static char* feSprintf(char* s, const char* fmt);
+static char* feSprintf(char* s, const char* fmt, int warn = -1);
 extern "C" char* find_executable(const char* argv0);
 #if defined(WINNT) && defined(__GNUC__)
@@ -141 +142 @@
 #ifdef RESOURCE_DEBUG
   printf("feInitResources: entering with argv0=%s=\n", argv0);
-  feResource('S');
+#endif
+  // init some Resources
   feResource('b');
   feResource('r');
-  feResource('s');
-#endif
+  // don't complain about stuff when initializing SingularPath
+  feResource('s',0);
+  
   
   
@@ -171 +174 @@
   }
 #ifdef RESOURCE_DEBUG
-  printf("feReInitResources: entering with feArgv0=%s=\n", feArgv0);
-  feResource('S');
+  printf("feInitResources: entering with argv0=%s=\n", argv0);
+#endif
+  // init some Resources
   feResource('b');
   feResource('r');
-  feResource('s');
-#endif
+  // don't complain about stuff when initializing SingularPath
+  feResource('s',0);
 }
 
@@ -275 +279 @@
   if (*value == '\0' && config->fmt != NULL )
   {
-    feSprintf(value, config->fmt);
+    feSprintf(value, config->fmt, warn);
   }
   else if (config->fmt == NULL)
@@ -321 +325 @@
     Warn("Either set environment variable %s to the location of %s", 
          config->env, config->key);
-    feSprintf(value, config->fmt);
+    feSprintf(value, config->fmt, warn);
     Warn("or make sure that %s is at %s", config->key, value);
   }
@@ -608 +612 @@
  *
  *****************************************************************/
-static char* feSprintf(char* s, const char* fmt)
+static char* feSprintf(char* s, const char* fmt, int warn)
 {
   char* s_in = s;
@@ -620 +624 @@
     {
       fmt++;
-      char* r = feResource(*fmt);
+      char* r = feResource(*fmt, warn);
       if (r != NULL)
       {