svn commit: samba r5760 - branches/SAMBA_3_0/source/rpcclient trunk/source/rpcclient

[gd at samba.org]

Author: gd
Date: 2005-03-12 00:50:47 +0000 (Sat, 12 Mar 2005)
New Revision: 5760

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

Log:
Be more verbose on listing forms.

Guenther

Modified:
   branches/SAMBA_3_0/source/rpcclient/cmd_spoolss.c
   trunk/source/rpcclient/cmd_spoolss.c


Changeset:
Modified: branches/SAMBA_3_0/source/rpcclient/cmd_spoolss.c
===================================================================
--- branches/SAMBA_3_0/source/rpcclient/cmd_spoolss.c	2005-03-11 20:59:16 UTC (rev 5759)
+++ branches/SAMBA_3_0/source/rpcclient/cmd_spoolss.c	2005-03-12 00:50:47 UTC (rev 5760)
@@ -1925,6 +1925,20 @@
 
 /* Enumerate forms */
 
+static const char *get_form_flag(int form_flag)
+{
+	switch (form_flag) {
+	case FORM_USER:
+		return "FORM_USER";
+	case FORM_BUILTIN:
+		return "FORM_BUILTIN";
+	case FORM_PRINTER:
+		return "FORM_PRINTER";
+	default:
+		return "unknown";
+	}
+}
+
 static WERROR cmd_spoolss_enum_forms(struct cli_state *cli, 
 				       TALLOC_CTX *mem_ctx, int argc, 
 				       const char **argv)
@@ -1980,7 +1994,14 @@
 			rpcstr_pull(form_name, forms[i].name.buffer,
 				    sizeof(form_name), -1, STR_TERMINATE);
 
-		printf("%s\n", form_name);
+		printf("%s\n" \
+			"\tflag: %s (%d)\n" \
+			"\twidth: %d, length: %d\n" \
+			"\tleft: %d, right: %d, top: %d, bottom: %d\n\n", 
+			form_name, get_form_flag(forms[i].flag), forms[i].flag,
+			forms[i].width, forms[i].length, 
+			forms[i].left, forms[i].right, 
+			forms[i].top, forms[i].bottom);
 	}
 
  done:

Modified: trunk/source/rpcclient/cmd_spoolss.c
===================================================================
--- trunk/source/rpcclient/cmd_spoolss.c	2005-03-11 20:59:16 UTC (rev 5759)
+++ trunk/source/rpcclient/cmd_spoolss.c	2005-03-12 00:50:47 UTC (rev 5760)
@@ -1925,6 +1925,20 @@
 
 /* Enumerate forms */
 
+static const char *get_form_flag(int form_flag)
+{
+	switch (form_flag) {
+	case FORM_USER:
+		return "FORM_USER";
+	case FORM_BUILTIN:
+		return "FORM_BUILTIN";
+	case FORM_PRINTER:
+		return "FORM_PRINTER";
+	default:
+		return "unknown";
+	}
+}
+
 static WERROR cmd_spoolss_enum_forms(struct cli_state *cli, 
 				       TALLOC_CTX *mem_ctx, int argc, 
 				       const char **argv)
@@ -1980,7 +1994,14 @@
 			rpcstr_pull(form_name, forms[i].name.buffer,
 				    sizeof(form_name), -1, STR_TERMINATE);
 
-		printf("%s\n", form_name);
+		printf("%s\n" \
+			"\tflag: %s (%d)\n" \
+			"\twidth: %d, length: %d\n" \
+			"\tleft: %d, right: %d, top: %d, bottom: %d\n\n", 
+			form_name, get_form_flag(forms[i].flag), forms[i].flag,
+			forms[i].width, forms[i].length, 
+			forms[i].left, forms[i].right, 
+			forms[i].top, forms[i].bottom);
 	}
 
  done: