Changeset 8246 for trunk/psModules/src/config/pmConfig.c

Timestamp:

Aug 8, 2006, 4:37:08 PM (20 years ago)

Author:

jhoblitt

Message:

normalize psTrace() facility names

File:

• trunk/psModules/src/config/pmConfig.c (modified) (11 diffs)

trunk/psModules/src/config/pmConfig.c

@@ -3 +3 @@
  *  @author PAP, IfA
  *
- *  @version $Revision: 1.36 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-02 19:33:29 $
+ *  @version $Revision: 1.37 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-09 02:37:07 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -92 +92 @@
     struct stat filestat;
 
-    psTrace(__func__, 3, "Loading %s configuration from file %s\n",
+    psTrace("psModules.config", 3, "Loading %s configuration from file %s\n",
             description, name);
 
@@ -307 +307 @@
     psString timeName = psMetadataLookupStr(&mdok, config->site, "TIME");
     if (mdok && timeName) {
-        psTrace(__func__, 7, "Initialising psTime with file %s\n", timeName);
+        psTrace("psModules.config", 7, "Initialising psTime with file %s\n", timeName);
         // XXX: PAP had a call to psLibInit is PRODUCTION not set.  Why?
         psTimeInitialize(timeName);
@@ -319 +319 @@
     int logLevel = psMetadataLookupS32(&mdok, config->site, "LOGLEVEL");
     if (mdok && logLevel >= 0) {
-        psTrace(__func__, 7, "Setting log level to %d\n", logLevel);
+        psTrace("psModules.config", 7, "Setting log level to %d\n", logLevel);
         psLogSetLevel(logLevel);
     }
@@ -330 +330 @@
     psString logFormat = psMetadataLookupStr(&mdok, config->site, "LOGFORMAT");
     if (mdok && logFormat) {
-        psTrace(__func__, 7, "Setting log format to %s\n", logFormat);
+        psTrace("psModules.config", 7, "Setting log format to %s\n", logFormat);
         psLogSetFormat(logFormat);
     }
@@ -380 +380 @@
                 continue;
             }
-            psTrace(__func__, 7, "Setting trace level for %s to %d\n", traceItem->name, traceItem->data.S32);
+            psTrace("psModules.config", 7, "Setting trace level for %s to %d\n", traceItem->name, traceItem->data.S32);
             psTraceSetLevel(traceItem->name, traceItem->data.S32);
         }
@@ -429 +429 @@
             // It doesn't have a required header keyword, so it's not it
             psFree(ruleIter);
-            psTrace(__func__, 5, "Can't find %s\n", ruleItem->name);
+            psTrace("psModules.config", 5, "Can't find %s\n", ruleItem->name);
             return false;
         }
@@ -435 +435 @@
         // Check to see if the rule works
         if (! psMetadataItemCompare(headerItem, ruleItem)) {
-            psTrace(__func__, 5, "%s doesn't match.\n", ruleItem->name);
+            psTrace("psModules.config", 5, "%s doesn't match.\n", ruleItem->name);
             psFree(ruleIter);
             return false;
@@ -476 +476 @@
             continue;
         }
-        psTrace(__func__, 5, "Reading camera format for %s...\n", formatsItem->name);
+        psTrace("psModules.config", 5, "Reading camera format for %s...\n", formatsItem->name);
         psMetadata *testFormat = NULL;  // Format to test against what we've got
         if (!readConfig(&testFormat, formatsItem->data.V, formatsItem->name)) {
@@ -529 +529 @@
         while ((camerasItem = psMetadataGetAndIncrement(camerasIter))) {
             // Open the camera information
-            psTrace(__func__, 3, "Inspecting camera %s (%s)\n", camerasItem->name, camerasItem->comment);
+            psTrace("psModules.config", 3, "Inspecting camera %s (%s)\n", camerasItem->name, camerasItem->comment);
             if (camerasItem->type != PS_DATA_STRING) {
                 psLogMsg(__func__, PS_LOG_WARN, "Camera configuration for %s in CAMERAS is not of type STR "
@@ -536 +536 @@
             }
 
-            psTrace(__func__, 5, "Reading camera configuration for %s...\n", camerasItem->name);
+            psTrace("psModules.config", 5, "Reading camera configuration for %s...\n", camerasItem->name);
             psMetadata *testCamera = NULL; // Camera to test against what we've got: