Changeset 86919e in git

Timestamp:

Jul 9, 2013, 6:11:06 PM (10 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

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

Children:

9eb3048810619c2e3a21b42e75704afa4aa18af5

Parents:

f88e07c79359c9680861c6db7a48478e2119bc60

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2013-07-09 18:11:06+02:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2013-07-09 22:25:11+02:00

Message:

Better debug output for resources + minor improvements

Location:

resources

Files:

• feResource.cc (modified) (18 diffs)
• feResource.h (modified) (1 diff)

resources/feResource.cc

@@ -151 +151 @@
 }
 
-char* feGetResource(const char id)
-{
-  return feResource(feGetResourceConfig(id), -1);
+char* feGetResource(const char id, int warn)
+{
+  return feResource(feGetResourceConfig(id), warn);
 }
 
@@ -181 +181 @@
     feArgv0 = strdup(argv0);
 #ifdef RESOURCE_DEBUG
-  printf("feInitResources: entering with argv0=%s=\n", feArgv0);
+  printf("feInitResources(argv0: '%s'): entering...\n", feArgv0);
 #endif
   // init some Resources
@@ -192 +192 @@
   char* path = feResource('p');
 #ifdef RESOURCE_DEBUG
-  printf("feInitResources: setting path with argv0=%s=\n", path);
+  printf("feInitResources(argv0): setting path with '%s'\n", path);
 #endif
 #ifdef HAVE_PUTENV
@@ -219 +219 @@
   }
 #ifdef RESOURCE_DEBUG
-  printf("feInitResources: entering with argv0=%s=\n", feArgv0);
+  printf("feInitResources(): entering...\n");
 #endif
   // init some Resources
@@ -275 +275 @@
   /*assume(config != NULL);*/
 #ifdef RESOURCE_DEBUG
-  printf("feInitResource: entering for %s\n", config->key);
+  printf("feInitResource(config->key: '%s', warn: '%d') : entering ...\n", config->key, warn);
 #endif
 
@@ -287 +287 @@
     {
 #ifdef RESOURCE_DEBUG
-      printf("feInitResource: Found value from env:%s\n", evalue);
+      printf("feInitResource(config,warn): Found value from env:%s\n", evalue);
 #endif
       strcpy(value, evalue);
@@ -296 +296 @@
       {
 #ifdef RESOURCE_DEBUG
-        printf("feInitResource: Set value of %s to =%s=\n", config->key, value);
+        printf("feInitResource(config,warn): Set value of config (with key: '%s') to '%s'\n", config->key, value);
 #endif
         config->value = strdup(value);
@@ -326 +326 @@
     char* executable = feResource('S');
 #ifdef RESOURCE_DEBUG
-      printf("feInitResource: Get %s from %s\n", config->key, executable);
+      printf("feInitResource(config,warn): Get '%s' from \"%s\"\n", config->key, executable);
 #endif
     if (executable != NULL)
@@ -346 +346 @@
   else if (config->fmt == NULL)
   {
-    printf("Bug >>Wrong Resource Specification of %s<< at %s:%d\n",config->key,__FILE__,__LINE__);
+    printf("Bug >>Wrong Resource Specification of '%s'<< at \"%s:%d\"\n",config->key,__FILE__,__LINE__);
+    // TODO: printf -> WarnS???
     return NULL;
   }
@@ -355 +356 @@
   {
 #ifdef RESOURCE_DEBUG
-    printf("feInitResource: Set value of %s to =%s=\n", config->key, value);
+    printf("feInitResource(config,warn): Set value of '%s' to \"%s\"\n", config->key, value);
 #endif
     config->value = strdup(value);
@@ -371 +372 @@
         config->value = strdup(value);
 #ifdef RESOURCE_DEBUG
-        printf("feInitResource: Set value of %s to =%s=\n", config->key, config->value);
+        printf("feInitResource(config,warn): Set value of '%s' to \"%s\"\n", config->key, config->value);
 #endif
         return config->value;
@@ -382 +383 @@
   if (warn > 0 || (warn < 0 && config->value != NULL))
   {
-    printf("// ** Could not get %s.\n", config->key);
-    printf("// ** Either set environment variable %s to %s,\n",
+    printf("// ** Could not get '%s'.\n", config->key);
+    printf("// ** Either set environment variable '%s' to '%s',\n",
          config->env, config->key);
     feSprintf(value, config->fmt, warn);
-    printf("// ** or make sure that %s is at %s\n", config->key, value);
-  }
-#ifdef RESOURCE_DEBUG
-      printf("feInitResource: Set value of %s to NULL", config->key);
+    printf("// ** or make sure that '%s' is at \"%s\"\n", config->key, value);
+  }
+#ifdef RESOURCE_DEBUG
+  printf("feInitResource(config,warn): Set value of '%s' to NULL", config->key);
 #endif
   config->value = NULL;
@@ -417 +418 @@
 #endif
 #ifdef RESOURCE_DEBUG
-  printf("feGetExpandedExecutable: calling find_exec with =%s=\n", feArgv0);
+  printf("feGetExpandedExecutable: calling find_exec with \"%s\"\n", feArgv0);
 #endif
   char executable[MAXRESOURCELEN];
   char* value = omFindExec(feArgv0, executable);
 #ifdef RESOURCE_DEBUG
-  printf("feGetExpandedExecutable: find_exec exited with =%s=%d\n", executable, access(executable, X_OK));
+  printf("feGetExpandedExecutable: find_exec exited with \"%s\": %d\n", executable, access(executable, X_OK));
 #endif
   if (value == NULL)
   {
-    printf("Bug >>Could not get expanded executable from %s<< at %s:%d\n",feArgv0,__FILE__,__LINE__);
+    printf("Bug >>Could not get expanded executable from \"%s\"<< at %s:%d\n",feArgv0,__FILE__,__LINE__);
     return NULL;
   }
@@ -436 +437 @@
 {
 #ifdef RESOURCE_DEBUG
-  printf("feVerifyResourceValue: entering with =%s=\n", value);
-  printf("%d:%d\n", access(value, R_OK), access(value, X_OK));
+  printf("feVerifyResourceValue(type: %d, value: \"%s\"): entering\n", (int)type, value);
+  printf("Access: ROK: %d, XOK: %d\n", access(value, R_OK), access(value, X_OK));
 #endif
   switch(type)
@@ -590 +591 @@
     path_comps[i] = feCleanUpFile(path_comps[i]);
 #ifdef RESOURCE_DEBUG
-  PrintS("feCleanUpPath: after CleanUpName: ");
+  printf("feCleanUpPath: after CleanUpName: ");
   for (i=0; i<n_comps; i++)
-    Print("%s:", path_comps[i]);
-  Print("\n");
+    printf("%s:", path_comps[i]);
+  printf("\n");
 #endif
 
@@ -600 +601 @@
 #ifdef RESOURCE_DEBUG
     if (access(path_comps[i], X_OK | R_OK))
-      Print("feCleanUpPath: remove %d:%s -- can not access\n", i, path_comps[i]);
+      printf("feCleanUpPath: remove %d:%s -- can not access\n", i, path_comps[i]);
 #endif
     if ( ! access(path_comps[i], X_OK | R_OK))
@@ -611 +612 @@
           // found a duplicate
 #ifdef RESOURCE_DEBUG
-          Print("feCleanUpPath: remove %d:%s -- equal to %d:%s\n", j, path_comps[j], i, path_comps[i]);
+          printf("feCleanUpPath: remove %d:%s -- equal to %d:%s\n", j, path_comps[j], i, path_comps[i]);
 #endif
           j = i+1;
@@ -649 +650 @@
   free(path_comps);
 #ifdef RESOURCE_DEBUG
-  Print("feCleanUpPath: leaving with path=%s=\n", opath);
+  printf("feCleanUpPath: leaving with path=%s=\n", opath);
 #endif
   return opath;

resources/feResource.h

@@ -40 +40 @@
 char* feResource(const char* key, int warn = -1);
 
-char* feGetResource(const char id);
+char* feGetResource(const char id, int warn = -1);
 
 // char* feResourceDefault(const char id);