remove a 'discard const ...' warning in papd cups

diff --git a/etc/papd/print_cups.c b/etc/papd/print_cups.c
index c0e293693adc2d76cbe792d9e98713df2fdecf18..ca8644c741aa72094de71930e97cff0055e5de45 100644 (file)
--- a/etc/papd/print_cups.c
+++ b/etc/papd/print_cups.c
@@ -1,5 +1,5 @@
 /*
- * $Id: print_cups.c,v 1.5 2009-10-29 11:35:58 didg Exp $
+ * $Id: print_cups.c,v 1.6 2010-01-26 20:43:11 didg Exp $
  *
  * Copyright 2004 Bjoern Fernhomberg.
  *
@@ -60,13 +60,13 @@ static const char* cups_status_msg[] = {
 };
 
 /* Local functions */
-static int     convert_to_mac_name ( char *encoding, char * inptr, char * outptr, size_t outlen);
+static int     convert_to_mac_name ( const char *encoding, char * inptr, char * outptr, size_t outlen);
 static size_t  to_ascii ( char *inbuf, char **outbuf);
 static int     cups_mangle_printer_name ( struct printer *pr, struct printer *printers);
 static void     cups_free_printer ( struct printer *pr);
 
 
-char * cups_get_language (void)
+const char * cups_get_language (void)
 {
         cups_lang_t *language;
 
@@ -523,7 +523,7 @@ to_ascii ( char  *inptr, char **outptr)
  * Returns: -1 on failure, length of name on success; outpr contains name in MacRoman
  */
 
-static int convert_to_mac_name ( char * encoding, char * inptr, char * outptr, size_t outlen)
+static int convert_to_mac_name ( const char * encoding, char * inptr, char * outptr, size_t outlen)
 {
        char    *outbuf;
        char    *soptr;

diff --git a/etc/papd/print_cups.h b/etc/papd/print_cups.h
index 10a9ca707cac1804bece13219143f128fb0dc470..dd9e71122171f6cb2936ec0d30df38a5817ded26 100644 (file)
--- a/etc/papd/print_cups.h
+++ b/etc/papd/print_cups.h
@@ -16,6 +16,6 @@ int           cups_get_printer_status (struct printer *pr);
 int            cups_print_job ( char *, char *, char *, char *, char *);\r
 struct printer * cups_autoadd_printers ( struct printer *, struct printer *);\r
 int            cups_check_printer ( struct printer *, struct printer *, int);\r
-char           *cups_get_language ( void );\r
+const char     *cups_get_language ( void );\r
 #endif /* HAVE_CUPS */\r
 #endif /* PAPD_CUPS_H */\r

diff --git a/include/atalk/unicode.h b/include/atalk/unicode.h
index 21ef32f020ff658ad0ad2a858678eb583427a768..1cea56c4d13347481fc687ac379a39d649c4ffaf 100644 (file)
--- a/include/atalk/unicode.h
+++ b/include/atalk/unicode.h
@@ -143,6 +143,6 @@ extern size_t   charset_decompose  ( charset_t, char *, size_t, char *, size_t);
 extern size_t   utf8_precompose ( char *, size_t, char *, size_t);
 extern size_t   utf8_decompose  ( char *, size_t, char *, size_t);
 
-extern charset_t add_charset (char* name);
+extern charset_t add_charset (const char* name);
 
 #endif  /* _ATALK_UNICODE_H */

diff --git a/libatalk/unicode/charcnv.c b/libatalk/unicode/charcnv.c
index 4cad3e9c60f815ba18e8759fb82a0a4442d55d60..9e4ec67acfcd8bfd04b2d98ff8ca3e1ed3415afc 100644 (file)
--- a/libatalk/unicode/charcnv.c
+++ b/libatalk/unicode/charcnv.c
@@ -191,7 +191,7 @@ static void lazy_initialize_conv(void)
     }
 }
 
-charset_t add_charset(char* name)
+charset_t add_charset(const char* name)
 {
     static charset_t max_charset_t = NUM_CHARSETS-1;
     charset_t cur_charset_t = max_charset_t+1;