Changeset 16338

Timestamp:

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

Author:

Paul Price

Message:

Removing entire concept of specifying a protocol to psMessageDestination.

File:

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

trunk/psLib/src/sys/psLogMsg.c

@@ -11 +11 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.68 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-02-06 20:30:49 $
+ *  @version $Revision: 1.69 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-02-06 20:33:18 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -195 +195 @@
     }
 
-    // Destination is protocol:location
-    psList *protocolLocation = psStringSplit(dest, ":", false); // A list containing the protocol and location
-    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);
+    int fileD = creat(dest, 0666);
+    if (fileD == 0) {
+        psError(PS_ERR_IO, true, _("Could not open file '%s' for output."), dest);
         return -1;
-    } else {
-        protocol = psListGet(protocolLocation, PS_LIST_HEAD);
-        location = psListGet(protocolLocation, PS_LIST_TAIL);
-    }
-
-    if (strcasecmp(protocol, "file") == 0) {
-        int fileD = creat(location, 0666);
-
-        if (fileD == 0) {
-            psError(PS_ERR_IO, true, _("Could not open file '%s' for output."),
-                    location);
-            psFree(protocolLocation);
-            return -1;
-        }
-        psFree(protocolLocation);
-        return fileD;
-    }
-
-    psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Unrecognised protocol: %s\n", protocol);
-    psFree(protocolLocation);
-    return -1;
+    }
+    return fileD;
 }