Changeset 15516 for branches/eam_branch_20071023/psModules/src/camera/pmFPAConstruct.c

Timestamp:

Nov 8, 2007, 12:59:04 PM (19 years ago)

Author:

eugene

Message:

accepting updates from HEAD

File:

• branches/eam_branch_20071023/psModules/src/camera/pmFPAConstruct.c (modified) (3 diffs)

branches/eam_branch_20071023/psModules/src/camera/pmFPAConstruct.c

@@ -45 +45 @@
     psMetadata *cellData = psMetadataLookupMetadata(&status, cells, cellName); // The data for the particular cell
     if (!status || !cellData) {
-        psLogMsg(__func__, PS_LOG_WARN, "Unable to find specs for cell %s: ignored\n", cellName);
+        psWarning("Unable to find specs for cell %s: ignored\n", cellName);
     }
 
@@ -304 +304 @@
         // Put in the cell data
         if (newCell->config) {
-            psLogMsg(__func__, PS_LOG_WARN, "Overwriting cell data in chip\n");
+            psWarning("Overwriting cell data in chip\n");
             psFree(newCell->config); // Make way!
         }
@@ -1304 +1304 @@
         const char *chipName = componentsItem->name; // Name of the chip
         if (componentsItem->type != PS_DATA_STRING) {
-            psLogMsg(__func__, PS_LOG_WARN, "Element %s in FPA within the camera configuration is not of "
+            psWarning("Element %s in FPA within the camera configuration is not of "
                      "type STR (type=%x) --- ignored.\n", chipName, componentsItem->type);
             continue;