svn commit: samba r9491 - in branches/SAMBA_4_0: source/scripting/bin testprogs/ejs

[tridge at samba.org]

Author: tridge
Date: 2005-08-22 23:31:18 +0000 (Mon, 22 Aug 2005)
New Revision: 9491

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9491

Log:

fixed up a few scripts that need to be updated for the new GetOptions syntax. Mimir, its
a good idea to use grep -r to find places that need fixing when you change the syntax of 
a call :-)

Modified:
   branches/SAMBA_4_0/source/scripting/bin/winreg
   branches/SAMBA_4_0/testprogs/ejs/argv.js
   branches/SAMBA_4_0/testprogs/ejs/echo.js
   branches/SAMBA_4_0/testprogs/ejs/ldap.js
   branches/SAMBA_4_0/testprogs/ejs/nbtstats
   branches/SAMBA_4_0/testprogs/ejs/samr.js


Changeset:
Modified: branches/SAMBA_4_0/source/scripting/bin/winreg
===================================================================
--- branches/SAMBA_4_0/source/scripting/bin/winreg	2005-08-22 22:33:58 UTC (rev 9490)
+++ branches/SAMBA_4_0/source/scripting/bin/winreg	2005-08-22 23:31:18 UTC (rev 9491)
@@ -9,14 +9,12 @@
 libinclude("base.js");
 libinclude("winreg.js");
 
-var options = new Object();
-
-ok = GetOptions(ARGV, options,
-		"POPT_AUTOHELP",
-		"POPT_COMMON_SAMBA",
-		"POPT_COMMON_CREDENTIALS");
-if (ok == false) {
-	println("Failed to parse options: " + options.ERROR);
+var options = GetOptions(ARGV,
+			 "POPT_AUTOHELP",
+			 "POPT_COMMON_SAMBA",
+			 "POPT_COMMON_CREDENTIALS");
+if (options == undefined) {
+	println("Failed to parse options");
 	return -1;
 }
 

Modified: branches/SAMBA_4_0/testprogs/ejs/argv.js
===================================================================
--- branches/SAMBA_4_0/testprogs/ejs/argv.js	2005-08-22 22:33:58 UTC (rev 9490)
+++ branches/SAMBA_4_0/testprogs/ejs/argv.js	2005-08-22 23:31:18 UTC (rev 9491)
@@ -2,16 +2,12 @@
 	demonstrate use of GetOptions
 */
 
-var ok;
-var options = new Object();
-
-ok = GetOptions(ARGV, options,
+var options = GetOptions(ARGV, 
 		"POPT_AUTOHELP",
 		"POPT_COMMON_SAMBA",
 		"myopt=s",
 		"intopt=i",
 		"noopt");
-printVars(ok);
 
 println("You called this script with arguments:");
 

Modified: branches/SAMBA_4_0/testprogs/ejs/echo.js
===================================================================
--- branches/SAMBA_4_0/testprogs/ejs/echo.js	2005-08-22 22:33:58 UTC (rev 9490)
+++ branches/SAMBA_4_0/testprogs/ejs/echo.js	2005-08-22 23:31:18 UTC (rev 9491)
@@ -3,14 +3,12 @@
 	test echo pipe calls from ejs
 */	
 
-var options = new Object();
-
-ok = GetOptions(ARGV, options,
+var options = GetOptions(ARGV, 
 		"POPT_AUTOHELP",
 		"POPT_COMMON_SAMBA",
 		"POPT_COMMON_CREDENTIALS");
-if (ok == false) {
-   println("Failed to parse options: " + options.ERROR);
+if (options == undefined) {
+   println("Failed to parse options");
    return -1;
 }
 

Modified: branches/SAMBA_4_0/testprogs/ejs/ldap.js
===================================================================
--- branches/SAMBA_4_0/testprogs/ejs/ldap.js	2005-08-22 22:33:58 UTC (rev 9490)
+++ branches/SAMBA_4_0/testprogs/ejs/ldap.js	2005-08-22 23:31:18 UTC (rev 9491)
@@ -6,14 +6,12 @@
 
 var ldb = ldb_init();
 
-var options = new Object();
-
-ok = GetOptions(ARGV, options,
+var options = GetOptions(ARGV, 
 		"POPT_AUTOHELP",
 		"POPT_COMMON_SAMBA",
 		"POPT_COMMON_CREDENTIALS");
-if (ok == false) {
-   println("Failed to parse options: " + options.ERROR);
+if (options == undefined) {
+   println("Failed to parse options");
    return -1;
 }
 

Modified: branches/SAMBA_4_0/testprogs/ejs/nbtstats
===================================================================
--- branches/SAMBA_4_0/testprogs/ejs/nbtstats	2005-08-22 22:33:58 UTC (rev 9490)
+++ branches/SAMBA_4_0/testprogs/ejs/nbtstats	2005-08-22 23:31:18 UTC (rev 9491)
@@ -3,13 +3,11 @@
 	demonstrate access to irpc calls from ejs
 */	
 
-var options = new Object();
-
-ok = GetOptions(ARGV, options,
-		"POPT_AUTOHELP",
-		"POPT_COMMON_SAMBA");
-if (ok == false) {
-   println("Failed to parse options: " + options.ERROR);
+var options = GetOptions(ARGV, 
+			 "POPT_AUTOHELP",
+			 "POPT_COMMON_SAMBA");
+if (options == undefined) {
+   println("Failed to parse options");
    return -1;
 }
 

Modified: branches/SAMBA_4_0/testprogs/ejs/samr.js
===================================================================
--- branches/SAMBA_4_0/testprogs/ejs/samr.js	2005-08-22 22:33:58 UTC (rev 9490)
+++ branches/SAMBA_4_0/testprogs/ejs/samr.js	2005-08-22 23:31:18 UTC (rev 9491)
@@ -3,14 +3,12 @@
   test samr calls from ejs
 */	
 
-var options = new Object();
-
-ok = GetOptions(ARGV, options,
-		"POPT_AUTOHELP",
-		"POPT_COMMON_SAMBA",
-		"POPT_COMMON_CREDENTIALS");
-if (ok == false) {
-   println("Failed to parse options: " + options.ERROR);
+var options = GetOptions(ARGV, 
+			 "POPT_AUTOHELP",
+			 "POPT_COMMON_SAMBA",
+			 "POPT_COMMON_CREDENTIALS");
+if (options == undefined) {
+   println("Failed to parse options");
    return -1;
 }