Changeset 22 for trunk/gui

Timestamp:

Feb 25, 2013, 6:33:32 AM (13 years ago)

Author:

Alex Taylor

Message:

Fixed return code handling in a couple of shared functions.

File:

• trunk/gui/shared/PrintUtl.VRS (modified) (2 diffs)

trunk/gui/shared/PrintUtl.VRS

@@ -328 +328 @@
     PARSE ARG driver, driverfull, model
 
+    ok = 0
     targetdir = globals.!os2dir'\DLL\'driver
     IF ( VRFileExists( targetdir'\'driver'.DRV') == 0 ) THEN DO
         CALL VRMkDir targetdir
-        rc = CopyDriverToSource( driverfull, targetdir )
+        ok = CopyDriverToSource( driverfull, targetdir )
     END
     IF VRGetIni('PM_DEVICE_DRIVERS', driver, 'USER', 'NoClose') <> driverfull THEN
         CALL VRSetIni 'PM_DEVICE_DRIVERS', driver, driverfull||'00'x, 'USER'
     CALL VRSetIni 'PM_SPOOLER_DD', driver'.'model, driver'.DRV;;;'||'00'x, 'SYSTEM'
-RETURN rc
+RETURN ok
 
 
@@ -350 +351 @@
     setup = 'PORTNAME='portname';PRINTDRIVER='driver'.'model';QUEUENAME='queuename';TAKEDEFAULTS=YES'
 
-    rc = SysCreateObject('WPPrinter', printername, '<WP_DESKTOP>', setup';OBJECTID='oid';', 'F')
-    IF rc == 1 THEN
+    ok = SysCreateObject('WPPrinter', printername, '<WP_DESKTOP>', setup';OBJECTID='oid';', 'F')
+    IF ok == 1 THEN
         CALL SysMoveObject oid, '<WP_PRINTERSFOLDER>'
     ELSE
-        rc = SysCreateObject('WPPrinter', printername, '<WP_DESKTOP>', setup';', 'F')
-
-RETURN rc
+        ok = SysCreateObject('WPPrinter', printername, '<WP_DESKTOP>', setup';', 'F')
+
+RETURN ok