sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-28 07:21:54 +03:00
Code

r19154: Trivial logic simplification: Get rid of two indentation levels. Survives the

Browse Source 
consistency checks just checked into Samba4.

Volker
(This used to be commit c48bb4b37b)
This commit is contained in:
Volker Lendecke 2006-10-06 19:07:23 +00:00 committed by Gerald (Jerry) Carter
parent 9315bcd1e3
commit e918cf3abf
1 changed files with 55 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
source3/rpc_server/srv_spoolss_nt.c
View File

@ -4346,30 +4346,41 @@ static WERROR enum_all_printers_info_1(uint32 flags, RPC_BUFFER *buffer, uint32
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 (construct_printer_info_1(NULL, flags, &current_prt, &params)) {
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], &current_prt, sizeof(PRINTER_INFO_1));
(*returned)++;
}
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_1(NULL, flags, &current_prt,
&params)) {
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], &current_prt,
sizeof(PRINTER_INFO_1));
(*returned)++;
}
/* check the required size. */
@ -4535,31 +4546,39 @@ static WERROR enum_all_printers_info_2(RPC_BUFFER *buffer, uint32 offered, uint3
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));
if (construct_printer_info_2(NULL, &current_prt, &params)) {
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));
memcpy(&printers[*returned], &current_prt, sizeof(PRINTER_INFO_2));
(*returned)++;
}
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, &current_prt,
&params)) {
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));
memcpy(&printers[*returned], &current_prt,
sizeof(PRINTER_INFO_2));
(*returned)++;
}
/* check the required size. */