From 30191d1a5704ad2b158386b511558972d539ce47 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 18 Oct 2007 17:40:25 -0700 Subject: RIP BOOL. Convert BOOL -> bool. I found a few interesting bugs in various places whilst doing this (places that assumed BOOL == int). I also need to fix the Samba4 pidl generation (next checkin). Jeremy. (This used to be commit f35a266b3cbb3e5fa6a86be60f34fe340a3ca71f) --- source3/rpc_server/srv_spoolss.c | 104 +++++++++++++++++++-------------------- 1 file changed, 52 insertions(+), 52 deletions(-) mode change 100755 => 100644 source3/rpc_server/srv_spoolss.c (limited to 'source3/rpc_server/srv_spoolss.c') diff --git a/source3/rpc_server/srv_spoolss.c b/source3/rpc_server/srv_spoolss.c old mode 100755 new mode 100644 index 32e0c6e4ed..7802fe447e --- a/source3/rpc_server/srv_spoolss.c +++ b/source3/rpc_server/srv_spoolss.c @@ -31,7 +31,7 @@ * api_spoolss_open_printer_ex (rarely seen - older call) ********************************************************************/ -static BOOL api_spoolss_open_printer(pipes_struct *p) +static bool api_spoolss_open_printer(pipes_struct *p) { SPOOL_Q_OPEN_PRINTER q_u; SPOOL_R_OPEN_PRINTER r_u; @@ -61,7 +61,7 @@ static BOOL api_spoolss_open_printer(pipes_struct *p) * api_spoolss_open_printer_ex ********************************************************************/ -static BOOL api_spoolss_open_printer_ex(pipes_struct *p) +static bool api_spoolss_open_printer_ex(pipes_struct *p) { SPOOL_Q_OPEN_PRINTER_EX q_u; SPOOL_R_OPEN_PRINTER_EX r_u; @@ -92,7 +92,7 @@ static BOOL api_spoolss_open_printer_ex(pipes_struct *p) * called from the spoolss dispatcher ********************************************************************/ -static BOOL api_spoolss_getprinterdata(pipes_struct *p) +static bool api_spoolss_getprinterdata(pipes_struct *p) { SPOOL_Q_GETPRINTERDATA q_u; SPOOL_R_GETPRINTERDATA r_u; @@ -124,7 +124,7 @@ static BOOL api_spoolss_getprinterdata(pipes_struct *p) * called from the spoolss dispatcher ********************************************************************/ -static BOOL api_spoolss_deleteprinterdata(pipes_struct *p) +static bool api_spoolss_deleteprinterdata(pipes_struct *p) { SPOOL_Q_DELETEPRINTERDATA q_u; SPOOL_R_DELETEPRINTERDATA r_u; @@ -156,7 +156,7 @@ static BOOL api_spoolss_deleteprinterdata(pipes_struct *p) * called from the spoolss dispatcher ********************************************************************/ -static BOOL api_spoolss_closeprinter(pipes_struct *p) +static bool api_spoolss_closeprinter(pipes_struct *p) { SPOOL_Q_CLOSEPRINTER q_u; SPOOL_R_CLOSEPRINTER r_u; @@ -187,7 +187,7 @@ static BOOL api_spoolss_closeprinter(pipes_struct *p) * called from the spoolss dispatcher ********************************************************************/ -static BOOL api_spoolss_abortprinter(pipes_struct *p) +static bool api_spoolss_abortprinter(pipes_struct *p) { SPOOL_Q_ABORTPRINTER q_u; SPOOL_R_ABORTPRINTER r_u; @@ -218,7 +218,7 @@ static BOOL api_spoolss_abortprinter(pipes_struct *p) * called from the spoolss dispatcher ********************************************************************/ -static BOOL api_spoolss_deleteprinter(pipes_struct *p) +static bool api_spoolss_deleteprinter(pipes_struct *p) { SPOOL_Q_DELETEPRINTER q_u; SPOOL_R_DELETEPRINTER r_u; @@ -250,7 +250,7 @@ static BOOL api_spoolss_deleteprinter(pipes_struct *p) * called from the spoolss dispatcher ********************************************************************/ -static BOOL api_spoolss_deleteprinterdriver(pipes_struct *p) +static bool api_spoolss_deleteprinterdriver(pipes_struct *p) { SPOOL_Q_DELETEPRINTERDRIVER q_u; SPOOL_R_DELETEPRINTERDRIVER r_u; @@ -281,7 +281,7 @@ static BOOL api_spoolss_deleteprinterdriver(pipes_struct *p) * ReplyFindFirstPrinterChangeNotifyEx ********************************************************************/ -static BOOL api_spoolss_rffpcnex(pipes_struct *p) +static bool api_spoolss_rffpcnex(pipes_struct *p) { SPOOL_Q_RFFPCNEX q_u; SPOOL_R_RFFPCNEX r_u; @@ -318,7 +318,7 @@ static BOOL api_spoolss_rffpcnex(pipes_struct *p) * JRA. ********************************************************************/ -static BOOL api_spoolss_rfnpcnex(pipes_struct *p) +static bool api_spoolss_rfnpcnex(pipes_struct *p) { SPOOL_Q_RFNPCNEX q_u; SPOOL_R_RFNPCNEX r_u; @@ -353,7 +353,7 @@ static BOOL api_spoolss_rfnpcnex(pipes_struct *p) * ********************************************************************/ -static BOOL api_spoolss_enumprinters(pipes_struct *p) +static bool api_spoolss_enumprinters(pipes_struct *p) { SPOOL_Q_ENUMPRINTERS q_u; SPOOL_R_ENUMPRINTERS r_u; @@ -384,7 +384,7 @@ static BOOL api_spoolss_enumprinters(pipes_struct *p) * ********************************************************************/ -static BOOL api_spoolss_getprinter(pipes_struct *p) +static bool api_spoolss_getprinter(pipes_struct *p) { SPOOL_Q_GETPRINTER q_u; SPOOL_R_GETPRINTER r_u; @@ -415,7 +415,7 @@ static BOOL api_spoolss_getprinter(pipes_struct *p) * ********************************************************************/ -static BOOL api_spoolss_getprinterdriver2(pipes_struct *p) +static bool api_spoolss_getprinterdriver2(pipes_struct *p) { SPOOL_Q_GETPRINTERDRIVER2 q_u; SPOOL_R_GETPRINTERDRIVER2 r_u; @@ -446,7 +446,7 @@ static BOOL api_spoolss_getprinterdriver2(pipes_struct *p) * ********************************************************************/ -static BOOL api_spoolss_startpageprinter(pipes_struct *p) +static bool api_spoolss_startpageprinter(pipes_struct *p) { SPOOL_Q_STARTPAGEPRINTER q_u; SPOOL_R_STARTPAGEPRINTER r_u; @@ -477,7 +477,7 @@ static BOOL api_spoolss_startpageprinter(pipes_struct *p) * ********************************************************************/ -static BOOL api_spoolss_endpageprinter(pipes_struct *p) +static bool api_spoolss_endpageprinter(pipes_struct *p) { SPOOL_Q_ENDPAGEPRINTER q_u; SPOOL_R_ENDPAGEPRINTER r_u; @@ -505,7 +505,7 @@ static BOOL api_spoolss_endpageprinter(pipes_struct *p) /******************************************************************** ********************************************************************/ -static BOOL api_spoolss_startdocprinter(pipes_struct *p) +static bool api_spoolss_startdocprinter(pipes_struct *p) { SPOOL_Q_STARTDOCPRINTER q_u; SPOOL_R_STARTDOCPRINTER r_u; @@ -533,7 +533,7 @@ static BOOL api_spoolss_startdocprinter(pipes_struct *p) /******************************************************************** ********************************************************************/ -static BOOL api_spoolss_enddocprinter(pipes_struct *p) +static bool api_spoolss_enddocprinter(pipes_struct *p) { SPOOL_Q_ENDDOCPRINTER q_u; SPOOL_R_ENDDOCPRINTER r_u; @@ -561,7 +561,7 @@ static BOOL api_spoolss_enddocprinter(pipes_struct *p) /******************************************************************** ********************************************************************/ -static BOOL api_spoolss_writeprinter(pipes_struct *p) +static bool api_spoolss_writeprinter(pipes_struct *p) { SPOOL_Q_WRITEPRINTER q_u; SPOOL_R_WRITEPRINTER r_u; @@ -590,7 +590,7 @@ static BOOL api_spoolss_writeprinter(pipes_struct *p) ****************************************************************************/ -static BOOL api_spoolss_setprinter(pipes_struct *p) +static bool api_spoolss_setprinter(pipes_struct *p) { SPOOL_Q_SETPRINTER q_u; SPOOL_R_SETPRINTER r_u; @@ -618,7 +618,7 @@ static BOOL api_spoolss_setprinter(pipes_struct *p) /**************************************************************************** ****************************************************************************/ -static BOOL api_spoolss_fcpn(pipes_struct *p) +static bool api_spoolss_fcpn(pipes_struct *p) { SPOOL_Q_FCPN q_u; SPOOL_R_FCPN r_u; @@ -646,7 +646,7 @@ static BOOL api_spoolss_fcpn(pipes_struct *p) /**************************************************************************** ****************************************************************************/ -static BOOL api_spoolss_addjob(pipes_struct *p) +static bool api_spoolss_addjob(pipes_struct *p) { SPOOL_Q_ADDJOB q_u; SPOOL_R_ADDJOB r_u; @@ -674,7 +674,7 @@ static BOOL api_spoolss_addjob(pipes_struct *p) /**************************************************************************** ****************************************************************************/ -static BOOL api_spoolss_enumjobs(pipes_struct *p) +static bool api_spoolss_enumjobs(pipes_struct *p) { SPOOL_Q_ENUMJOBS q_u; SPOOL_R_ENUMJOBS r_u; @@ -702,7 +702,7 @@ static BOOL api_spoolss_enumjobs(pipes_struct *p) /**************************************************************************** ****************************************************************************/ -static BOOL api_spoolss_schedulejob(pipes_struct *p) +static bool api_spoolss_schedulejob(pipes_struct *p) { SPOOL_Q_SCHEDULEJOB q_u; SPOOL_R_SCHEDULEJOB r_u; @@ -730,7 +730,7 @@ static BOOL api_spoolss_schedulejob(pipes_struct *p) /**************************************************************************** ****************************************************************************/ -static BOOL api_spoolss_setjob(pipes_struct *p) +static bool api_spoolss_setjob(pipes_struct *p) { SPOOL_Q_SETJOB q_u; SPOOL_R_SETJOB r_u; @@ -758,7 +758,7 @@ static BOOL api_spoolss_setjob(pipes_struct *p) /**************************************************************************** ****************************************************************************/ -static BOOL api_spoolss_enumprinterdrivers(pipes_struct *p) +static bool api_spoolss_enumprinterdrivers(pipes_struct *p) { SPOOL_Q_ENUMPRINTERDRIVERS q_u; SPOOL_R_ENUMPRINTERDRIVERS r_u; @@ -786,7 +786,7 @@ static BOOL api_spoolss_enumprinterdrivers(pipes_struct *p) /**************************************************************************** ****************************************************************************/ -static BOOL api_spoolss_getform(pipes_struct *p) +static bool api_spoolss_getform(pipes_struct *p) { SPOOL_Q_GETFORM q_u; SPOOL_R_GETFORM r_u; @@ -814,7 +814,7 @@ static BOOL api_spoolss_getform(pipes_struct *p) /**************************************************************************** ****************************************************************************/ -static BOOL api_spoolss_enumforms(pipes_struct *p) +static bool api_spoolss_enumforms(pipes_struct *p) { SPOOL_Q_ENUMFORMS q_u; SPOOL_R_ENUMFORMS r_u; @@ -842,7 +842,7 @@ static BOOL api_spoolss_enumforms(pipes_struct *p) /**************************************************************************** ****************************************************************************/ -static BOOL api_spoolss_enumports(pipes_struct *p) +static bool api_spoolss_enumports(pipes_struct *p) { SPOOL_Q_ENUMPORTS q_u; SPOOL_R_ENUMPORTS r_u; @@ -870,7 +870,7 @@ static BOOL api_spoolss_enumports(pipes_struct *p) /**************************************************************************** ****************************************************************************/ -static BOOL api_spoolss_addprinterex(pipes_struct *p) +static bool api_spoolss_addprinterex(pipes_struct *p) { SPOOL_Q_ADDPRINTEREX q_u; SPOOL_R_ADDPRINTEREX r_u; @@ -898,7 +898,7 @@ static BOOL api_spoolss_addprinterex(pipes_struct *p) /**************************************************************************** ****************************************************************************/ -static BOOL api_spoolss_addprinterdriver(pipes_struct *p) +static bool api_spoolss_addprinterdriver(pipes_struct *p) { SPOOL_Q_ADDPRINTERDRIVER q_u; SPOOL_R_ADDPRINTERDRIVER r_u; @@ -935,7 +935,7 @@ static BOOL api_spoolss_addprinterdriver(pipes_struct *p) /**************************************************************************** ****************************************************************************/ -static BOOL api_spoolss_getprinterdriverdirectory(pipes_struct *p) +static bool api_spoolss_getprinterdriverdirectory(pipes_struct *p) { SPOOL_Q_GETPRINTERDRIVERDIR q_u; SPOOL_R_GETPRINTERDRIVERDIR r_u; @@ -963,7 +963,7 @@ static BOOL api_spoolss_getprinterdriverdirectory(pipes_struct *p) /**************************************************************************** ****************************************************************************/ -static BOOL api_spoolss_enumprinterdata(pipes_struct *p) +static bool api_spoolss_enumprinterdata(pipes_struct *p) { SPOOL_Q_ENUMPRINTERDATA q_u; SPOOL_R_ENUMPRINTERDATA r_u; @@ -991,7 +991,7 @@ static BOOL api_spoolss_enumprinterdata(pipes_struct *p) /**************************************************************************** ****************************************************************************/ -static BOOL api_spoolss_setprinterdata(pipes_struct *p) +static bool api_spoolss_setprinterdata(pipes_struct *p) { SPOOL_Q_SETPRINTERDATA q_u; SPOOL_R_SETPRINTERDATA r_u; @@ -1018,7 +1018,7 @@ static BOOL api_spoolss_setprinterdata(pipes_struct *p) /**************************************************************************** ****************************************************************************/ -static BOOL api_spoolss_reset_printer(pipes_struct *p) +static bool api_spoolss_reset_printer(pipes_struct *p) { SPOOL_Q_RESETPRINTER q_u; SPOOL_R_RESETPRINTER r_u; @@ -1045,7 +1045,7 @@ static BOOL api_spoolss_reset_printer(pipes_struct *p) /**************************************************************************** ****************************************************************************/ -static BOOL api_spoolss_addform(pipes_struct *p) +static bool api_spoolss_addform(pipes_struct *p) { SPOOL_Q_ADDFORM q_u; SPOOL_R_ADDFORM r_u; @@ -1073,7 +1073,7 @@ static BOOL api_spoolss_addform(pipes_struct *p) /**************************************************************************** ****************************************************************************/ -static BOOL api_spoolss_deleteform(pipes_struct *p) +static bool api_spoolss_deleteform(pipes_struct *p) { SPOOL_Q_DELETEFORM q_u; SPOOL_R_DELETEFORM r_u; @@ -1101,7 +1101,7 @@ static BOOL api_spoolss_deleteform(pipes_struct *p) /**************************************************************************** ****************************************************************************/ -static BOOL api_spoolss_setform(pipes_struct *p) +static bool api_spoolss_setform(pipes_struct *p) { SPOOL_Q_SETFORM q_u; SPOOL_R_SETFORM r_u; @@ -1129,7 +1129,7 @@ static BOOL api_spoolss_setform(pipes_struct *p) /**************************************************************************** ****************************************************************************/ -static BOOL api_spoolss_enumprintprocessors(pipes_struct *p) +static bool api_spoolss_enumprintprocessors(pipes_struct *p) { SPOOL_Q_ENUMPRINTPROCESSORS q_u; SPOOL_R_ENUMPRINTPROCESSORS r_u; @@ -1157,7 +1157,7 @@ static BOOL api_spoolss_enumprintprocessors(pipes_struct *p) /**************************************************************************** ****************************************************************************/ -static BOOL api_spoolss_addprintprocessor(pipes_struct *p) +static bool api_spoolss_addprintprocessor(pipes_struct *p) { SPOOL_Q_ADDPRINTPROCESSOR q_u; SPOOL_R_ADDPRINTPROCESSOR r_u; @@ -1189,7 +1189,7 @@ static BOOL api_spoolss_addprintprocessor(pipes_struct *p) /**************************************************************************** ****************************************************************************/ -static BOOL api_spoolss_enumprintprocdatatypes(pipes_struct *p) +static bool api_spoolss_enumprintprocdatatypes(pipes_struct *p) { SPOOL_Q_ENUMPRINTPROCDATATYPES q_u; SPOOL_R_ENUMPRINTPROCDATATYPES r_u; @@ -1217,7 +1217,7 @@ static BOOL api_spoolss_enumprintprocdatatypes(pipes_struct *p) /**************************************************************************** ****************************************************************************/ -static BOOL api_spoolss_enumprintmonitors(pipes_struct *p) +static bool api_spoolss_enumprintmonitors(pipes_struct *p) { SPOOL_Q_ENUMPRINTMONITORS q_u; SPOOL_R_ENUMPRINTMONITORS r_u; @@ -1245,7 +1245,7 @@ static BOOL api_spoolss_enumprintmonitors(pipes_struct *p) /**************************************************************************** ****************************************************************************/ -static BOOL api_spoolss_getjob(pipes_struct *p) +static bool api_spoolss_getjob(pipes_struct *p) { SPOOL_Q_GETJOB q_u; SPOOL_R_GETJOB r_u; @@ -1276,7 +1276,7 @@ static BOOL api_spoolss_getjob(pipes_struct *p) * called from the spoolss dispatcher ********************************************************************/ -static BOOL api_spoolss_getprinterdataex(pipes_struct *p) +static bool api_spoolss_getprinterdataex(pipes_struct *p) { SPOOL_Q_GETPRINTERDATAEX q_u; SPOOL_R_GETPRINTERDATAEX r_u; @@ -1305,7 +1305,7 @@ static BOOL api_spoolss_getprinterdataex(pipes_struct *p) /**************************************************************************** ****************************************************************************/ -static BOOL api_spoolss_setprinterdataex(pipes_struct *p) +static bool api_spoolss_setprinterdataex(pipes_struct *p) { SPOOL_Q_SETPRINTERDATAEX q_u; SPOOL_R_SETPRINTERDATAEX r_u; @@ -1334,7 +1334,7 @@ static BOOL api_spoolss_setprinterdataex(pipes_struct *p) /**************************************************************************** ****************************************************************************/ -static BOOL api_spoolss_enumprinterkey(pipes_struct *p) +static bool api_spoolss_enumprinterkey(pipes_struct *p) { SPOOL_Q_ENUMPRINTERKEY q_u; SPOOL_R_ENUMPRINTERKEY r_u; @@ -1362,7 +1362,7 @@ static BOOL api_spoolss_enumprinterkey(pipes_struct *p) /**************************************************************************** ****************************************************************************/ -static BOOL api_spoolss_enumprinterdataex(pipes_struct *p) +static bool api_spoolss_enumprinterdataex(pipes_struct *p) { SPOOL_Q_ENUMPRINTERDATAEX q_u; SPOOL_R_ENUMPRINTERDATAEX r_u; @@ -1390,7 +1390,7 @@ static BOOL api_spoolss_enumprinterdataex(pipes_struct *p) /**************************************************************************** ****************************************************************************/ -static BOOL api_spoolss_getprintprocessordirectory(pipes_struct *p) +static bool api_spoolss_getprintprocessordirectory(pipes_struct *p) { SPOOL_Q_GETPRINTPROCESSORDIRECTORY q_u; SPOOL_R_GETPRINTPROCESSORDIRECTORY r_u; @@ -1418,7 +1418,7 @@ static BOOL api_spoolss_getprintprocessordirectory(pipes_struct *p) /**************************************************************************** ****************************************************************************/ -static BOOL api_spoolss_deleteprinterdataex(pipes_struct *p) +static bool api_spoolss_deleteprinterdataex(pipes_struct *p) { SPOOL_Q_DELETEPRINTERDATAEX q_u; SPOOL_R_DELETEPRINTERDATAEX r_u; @@ -1446,7 +1446,7 @@ static BOOL api_spoolss_deleteprinterdataex(pipes_struct *p) /**************************************************************************** ****************************************************************************/ -static BOOL api_spoolss_deleteprinterkey(pipes_struct *p) +static bool api_spoolss_deleteprinterkey(pipes_struct *p) { SPOOL_Q_DELETEPRINTERKEY q_u; SPOOL_R_DELETEPRINTERKEY r_u; @@ -1474,7 +1474,7 @@ static BOOL api_spoolss_deleteprinterkey(pipes_struct *p) /**************************************************************************** ****************************************************************************/ -static BOOL api_spoolss_addprinterdriverex(pipes_struct *p) +static bool api_spoolss_addprinterdriverex(pipes_struct *p) { SPOOL_Q_ADDPRINTERDRIVEREX q_u; SPOOL_R_ADDPRINTERDRIVEREX r_u; @@ -1511,7 +1511,7 @@ static BOOL api_spoolss_addprinterdriverex(pipes_struct *p) /**************************************************************************** ****************************************************************************/ -static BOOL api_spoolss_deleteprinterdriverex(pipes_struct *p) +static bool api_spoolss_deleteprinterdriverex(pipes_struct *p) { SPOOL_Q_DELETEPRINTERDRIVEREX q_u; SPOOL_R_DELETEPRINTERDRIVEREX r_u; @@ -1539,7 +1539,7 @@ static BOOL api_spoolss_deleteprinterdriverex(pipes_struct *p) /**************************************************************************** ****************************************************************************/ -static BOOL api_spoolss_xcvdataport(pipes_struct *p) +static bool api_spoolss_xcvdataport(pipes_struct *p) { SPOOL_Q_XCVDATAPORT q_u; SPOOL_R_XCVDATAPORT r_u; -- cgit