svn commit: samba r19154 - in branches/SAMBA_3_0/source/rpc_server:
.
vlendec at samba.org
vlendec at samba.org
Fri Oct 6 19:07:23 GMT 2006
Author: vlendec
Date: 2006-10-06 19:07:23 +0000 (Fri, 06 Oct 2006)
New Revision: 19154
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19154
Log:
Trivial logic simplification: Get rid of two indentation levels. Survives the
consistency checks just checked into Samba4.
Volker
Modified:
branches/SAMBA_3_0/source/rpc_server/srv_spoolss_nt.c
Changeset:
Modified: branches/SAMBA_3_0/source/rpc_server/srv_spoolss_nt.c
===================================================================
--- branches/SAMBA_3_0/source/rpc_server/srv_spoolss_nt.c 2006-10-06 19:02:02 UTC (rev 19153)
+++ branches/SAMBA_3_0/source/rpc_server/srv_spoolss_nt.c 2006-10-06 19:07:23 UTC (rev 19154)
@@ -4346,30 +4346,41 @@
int i;
int n_services=lp_numservices();
PRINTER_INFO_1 *printers=NULL;
- PRINTER_INFO_1 current_prt;
WERROR result = WERR_OK;
DEBUG(4,("enum_all_printers_info_1\n"));
for (snum=0; snum<n_services; snum++) {
- if (lp_browseable(snum) && lp_snum_ok(snum) && lp_print_ok(snum) ) {
- struct share_params params;
- params.service = snum;
+ PRINTER_INFO_1 current_prt;
+ struct share_params params;
+ params.service = snum;
- DEBUG(4,("Found a printer in smb.conf: %s[%x]\n", lp_servicename(snum), snum));
+ if (!lp_browseable(snum) || !lp_snum_ok(snum) ||
+ !lp_print_ok(snum) ) {
+ continue;
+ }
- if (construct_printer_info_1(NULL, flags, ¤t_prt, ¶ms)) {
- if((printers=SMB_REALLOC_ARRAY(printers, PRINTER_INFO_1, *returned +1)) == NULL) {
- DEBUG(2,("enum_all_printers_info_1: failed to enlarge printers buffer!\n"));
- *returned=0;
- return WERR_NOMEM;
- }
- DEBUG(4,("ReAlloced memory for [%d] PRINTER_INFO_1\n", *returned));
+ DEBUG(4,("Found a printer in smb.conf: %s[%x]\n",
+ lp_servicename(snum), snum));
- memcpy(&printers[*returned], ¤t_prt, sizeof(PRINTER_INFO_1));
- (*returned)++;
- }
+ if (!construct_printer_info_1(NULL, flags, ¤t_prt,
+ ¶ms)) {
+ continue;
}
+
+ if((printers=SMB_REALLOC_ARRAY(printers, PRINTER_INFO_1,
+ *returned +1)) == NULL) {
+ DEBUG(2,("enum_all_printers_info_1: failed to enlarge "
+ "printers buffer!\n"));
+ *returned=0;
+ return WERR_NOMEM;
+ }
+ DEBUG(4,("ReAlloced memory for [%d] PRINTER_INFO_1\n",
+ *returned));
+
+ memcpy(&printers[*returned], ¤t_prt,
+ sizeof(PRINTER_INFO_1));
+ (*returned)++;
}
/* check the required size. */
@@ -4535,31 +4546,39 @@
int i;
int n_services=lp_numservices();
PRINTER_INFO_2 *printers=NULL;
- PRINTER_INFO_2 current_prt;
WERROR result = WERR_OK;
*returned = 0;
for (snum=0; snum<n_services; snum++) {
- if (lp_browseable(snum) && lp_snum_ok(snum) && lp_print_ok(snum) ) {
- struct share_params params;
- params.service = snum;
- DEBUG(4,("Found a printer in smb.conf: %s[%x]\n", lp_servicename(snum), snum));
+ PRINTER_INFO_2 current_prt;
+ struct share_params params;
+ params.service = snum;
+ if (!lp_browseable(snum) || !lp_snum_ok(snum) ||
+ !lp_print_ok(snum) ) {
+ continue;
+ }
+ DEBUG(4,("Found a printer in smb.conf: %s[%x]\n",
+ lp_servicename(snum), snum));
- if (construct_printer_info_2(NULL, ¤t_prt, ¶ms)) {
- if ( !(printers=SMB_REALLOC_ARRAY(printers, PRINTER_INFO_2, *returned +1)) ) {
- DEBUG(2,("enum_all_printers_info_2: failed to enlarge printers buffer!\n"));
- *returned = 0;
- return WERR_NOMEM;
- }
+ if (!construct_printer_info_2(NULL, ¤t_prt,
+ ¶ms)) {
+ continue;
+ }
+ if ( !(printers=SMB_REALLOC_ARRAY(printers, PRINTER_INFO_2,
+ *returned +1)) ) {
+ DEBUG(2,("enum_all_printers_info_2: failed to enlarge "
+ "printers buffer!\n"));
+ *returned = 0;
+ return WERR_NOMEM;
+ }
- DEBUG(4,("ReAlloced memory for [%d] PRINTER_INFO_2\n", *returned + 1));
+ DEBUG(4,("ReAlloced memory for [%d] PRINTER_INFO_2\n",
+ *returned + 1));
- memcpy(&printers[*returned], ¤t_prt, sizeof(PRINTER_INFO_2));
-
- (*returned)++;
- }
- }
+ memcpy(&printers[*returned], ¤t_prt,
+ sizeof(PRINTER_INFO_2));
+ (*returned)++;
}
/* check the required size. */
More information about the samba-cvs
mailing list