From 27b7e51a3cc619f879655a3230611457ac43b9e7 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 14 Jan 2003 08:53:59 +0000 Subject: Merge from HEAD: - fstring/pstring mixups - the detection code that found them (disabled) - a bit of whitespace - a static Andrew Bartlett (This used to be commit 9b70fa868e7d9481f584c83fc4046174e1dedfd9) --- source3/printing/nt_printing.c | 2 +- source3/printing/printing.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/printing') diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c index f04992ac82..72e3d38bb3 100644 --- a/source3/printing/nt_printing.c +++ b/source3/printing/nt_printing.c @@ -1585,7 +1585,7 @@ static uint32 add_a_printer_driver_3(NT_PRINTER_DRIVER_INFO_LEVEL_3 *driver) int len, buflen; fstring architecture; pstring directory; - pstring temp_name; + fstring temp_name; pstring key; char *buf; int i, ret; diff --git a/source3/printing/printing.c b/source3/printing/printing.c index a770e7a09a..5f2594f07a 100644 --- a/source3/printing/printing.c +++ b/source3/printing/printing.c @@ -1934,7 +1934,7 @@ int print_queue_status(int snum, *queue = NULL; printername = lp_const_servicename(snum); pdb = get_print_db_byname(printername); - + if (!pdb) return 0; -- cgit