summaryrefslogtreecommitdiff
path: root/source3/printing/print_cups.c
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2003-01-15 18:57:41 +0000
committerGerald Carter <jerry@samba.org>2003-01-15 18:57:41 +0000
commit99cdb462083381c88689a4e698ca48b6ed4cf5ac (patch)
tree7ea530c74c8fd1ef65eec52410b7843e63d89f8f /source3/printing/print_cups.c
parent35fa2e5975f9b380e6e63471413df6f4182c164b (diff)
downloadsamba-99cdb462083381c88689a4e698ca48b6ed4cf5ac.tar.gz
samba-99cdb462083381c88689a4e698ca48b6ed4cf5ac.tar.bz2
samba-99cdb462083381c88689a4e698ca48b6ed4cf5ac.zip
*lots of small merges form HEAD
*sync up configure.in *don't build torture tools in make all *make sure to remove torture tools as part of make clean (This used to be commit 0fb724b3216eeeb97e61ff12755ca3a31bcad6ef)
Diffstat (limited to 'source3/printing/print_cups.c')
-rw-r--r--source3/printing/print_cups.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/source3/printing/print_cups.c b/source3/printing/print_cups.c
index d41367af8b..cc3941fe96 100644
--- a/source3/printing/print_cups.c
+++ b/source3/printing/print_cups.c
@@ -54,15 +54,13 @@ struct printif cups_printif =
* 'cups_passwd_cb()' - The CUPS password callback...
*/
-const char * /* O - Password or NULL */
+static const char * /* O - Password or NULL */
cups_passwd_cb(const char *prompt) /* I - Prompt */
{
/*
* Always return NULL to indicate that no password is available...
*/
- (void)prompt;
-
return (NULL);
}
@@ -209,10 +207,10 @@ void cups_printer_fn(void (*fn)(char *, char *))
/*
* 'cups_printername_ok()' - Provide the equivalent of pcap_printername_ok()
* for CUPS.
+ * O - 1 if printer name OK
+ * I - Name of printer
*/
-
-int /* O - 1 if printer name OK */
-cups_printername_ok(char *name) /* I - Name of printer */
+int cups_printername_ok(const char *name)
{
http_t *http; /* HTTP connection to server */
ipp_t *request, /* IPP Request */