Changeset 10 for rxprtutl/trunk/rxprtutl.c

Timestamp:

Apr 14, 2013, 5:21:42 AM (12 years ago)

Author:

Alex Taylor

Message:

RPUPortDelete function added.

File:

• rxprtutl/trunk/rxprtutl.c (modified) (5 diffs)

rxprtutl/trunk/rxprtutl.c

@@ -100 +100 @@
     "RPUQueueHold",
     "RPUOpenView",
+    "RPUPortDelete",
     "RPUPortDialog",
     "RPUPortInstall",
@@ -121 +122 @@
 RexxFunctionHandler RPUEnumPrinters;
 RexxFunctionHandler RPUOpenView;
+RexxFunctionHandler RPUPortDelete;
 RexxFunctionHandler RPUPortDialog;
 RexxFunctionHandler RPUPortInstall;
@@ -131 +133 @@
 
 // TODO
-RexxFunctionHandler RPUPortDelete;
-// - function to delete a printer (object, device and queue)
 
 // Internal functions
@@ -1011 +1011 @@
 
 /* ------------------------------------------------------------------------- *
+ * RPUPortDelete                                                             *
+ *                                                                           *
+ * Deletes a printer port.                                                   *
+ *                                                                           *
+ * REXX ARGUMENTS:                                                           *
+ *   1. The name of the port to be deleted.                       (REQUIRED) *
+ *                                                                           *
+ * REXX RETURN VALUE:                                                        *
+ *   1 on success, or 0 if an error occurred.                                *
+ * ------------------------------------------------------------------------- */
+ULONG APIENTRY RPUPortDelete( PSZ pszName, ULONG argc, RXSTRING argv[], PSZ pszQueue, PRXSTRING prsResult )
+{
+    PSZ    pszPortName;
+    SPLERR rc = 0;
+
+
+    // Reset the error indicator
+    WriteErrorCode( 0, NULL );
+
+    // Make sure we have at least one valid argument (the port name)
+    if ( argc < 1  || ( !RXVALIDSTRING(argv[0]) )) return ( 40 );
+    pszPortName = strupr( argv[0].strptr );
+
+    rc = SplDeletePort( NULL, pszPortName );
+    if ( rc == NO_ERROR ) {
+        // Return 1 on success
+        MAKERXSTRING( *prsResult, "1", 1 );
+    }
+    else {
+        WriteErrorCode( rc, "SplDeletePort");
+        MAKERXSTRING( *prsResult, "0", 1 );
+    }
+
+    return ( 0 );
+}
+
+
+/* ------------------------------------------------------------------------- *
  * RPUPrinterCreate                                                          *
  *                                                                           *
@@ -1119 +1157 @@
  *   1 on success, or 0 if an error occurred.  (1 will be returned even if   *
  *   the WPS printer object could not be deleted, so long as the queue and   *
- *   device were dstroyed successfully.)                                     *
+ *   device were destroyed successfully.)                                    *
  * ------------------------------------------------------------------------- */
 ULONG APIENTRY RPUPrinterDelete( PSZ pszName, ULONG argc, RXSTRING argv[], PSZ pszQueue, PRXSTRING prsResult )