Changeset 16337 for trunk/psLib/src/sys/psLogMsg.c

Timestamp:

Feb 6, 2008, 10:30:49 AM (18 years ago)

Author:

Paul Price

Message:

Changing behaviour of psMessageDestination so that a protocol is not
required to be specified. "file" is the default protocol (it's still
the only protocol).

File:

• trunk/psLib/src/sys/psLogMsg.c (modified) (2 diffs)

trunk/psLib/src/sys/psLogMsg.c

@@ -11 +11 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.67 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-10-26 02:40:24 $
+ *  @version $Revision: 1.68 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-02-06 20:30:49 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -197 +197 @@
     // Destination is protocol:location
     psList *protocolLocation = psStringSplit(dest, ":", false); // A list containing the protocol and location
-    if (protocolLocation->n != 2) {
+    const char *protocol, *location;    // Protocol and location for message
+    if (protocolLocation->n == 1) {
+        // "file" is the default protocol --- use it if no protocol is specified.
+        protocol = "file";
+        location = psListGet(protocolLocation, PS_LIST_TAIL); // The location
+    } else if (protocolLocation->n != 2) {
         psFree(protocolLocation);
         psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Unable to parse protocol:location from: %s\n", dest);
         return -1;
-    }
-    const char *protocol = psListGet(protocolLocation, PS_LIST_HEAD); // The protocol
-    const char *location = psListGet(protocolLocation, PS_LIST_TAIL); // The location
+    } else {
+        protocol = psListGet(protocolLocation, PS_LIST_HEAD);
+        location = psListGet(protocolLocation, PS_LIST_TAIL);
+    }
 
     if (strcasecmp(protocol, "file") == 0) {
-        //        FILE *file = fopen(location, "w");
         int fileD = creat(location, 0666);