fix compiler warning, from Olaf Hering.

diff --git a/bin/megatron/asingle.c b/bin/megatron/asingle.c
index 53414b6831a4ff5718992cfe2aa223be0df31b1a..9d21f2123e8ace25d27d1d9ee27659ce0d4bc005 100644 (file)
--- a/bin/megatron/asingle.c
+++ b/bin/megatron/asingle.c
@@ -1,5 +1,5 @@
 /*
- * $Id: asingle.c,v 1.8.6.1 2003-09-03 20:40:50 didg Exp $
+ * $Id: asingle.c,v 1.8.6.1.4.1 2005-02-06 10:16:00 didg Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -418,9 +418,9 @@ int single_read( fork, buffer, length )
            break;
     }
 
-    if ( single.entry[ entry_id ].ade_len < 0 ) {
-       fprintf( stderr, "single_read: Trying to read past end of fork!\n" );
-       return( single.entry[ entry_id ].ade_len );
+    if (single.entry[entry_id].ade_len > length) {
+       fprintf(stderr, "single_read: Trying to read past end of fork!, length %d, ade_len == %u\n", length, single.entry[entry_id].ade_len);
+       return single.entry[entry_id].ade_len;
     }
     if ( single.entry[ entry_id ].ade_len == 0 ) {
        if ( fork == DATA ) {

diff --git a/bin/megatron/hqx.c b/bin/megatron/hqx.c
index ebc98d55725f2098356eb625dce6b68e404e946e..2631898bfbc25566f1366491ec4d003c6c65722b 100644 (file)
--- a/bin/megatron/hqx.c
+++ b/bin/megatron/hqx.c
@@ -1,5 +1,5 @@
 /*
- * $Id: hqx.c,v 1.12.4.1 2003-09-03 20:40:50 didg Exp $
+ * $Id: hqx.c,v 1.12.4.1.4.1 2005-02-06 10:16:00 didg Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -207,9 +207,9 @@ int hqx_read( fork, buffer, length )
     fprintf( stderr, "hqx_read: remaining length is %d\n", hqx.forklen[fork] );
 #endif /* DEBUG >= 3 */
 
-    if ( hqx.forklen[ fork ] < 0 ) {
-       fprintf( stderr, "This should never happen, dude!\n" );
-       return( hqx.forklen[ fork ] );
+    if (hqx.forklen[fork] > length) {
+       fprintf(stderr, "This should never happen, dude! length %d, fork length == %u\n", length, hqx.forklen[fork]);
+       return hqx.forklen[fork];
     }
 
     if ( hqx.forklen[ fork ] == 0 ) {

diff --git a/bin/megatron/macbin.c b/bin/megatron/macbin.c
index 885ebb573aedd6b09d0cedd7468da0be430a0645..47ab5d96608509f5af2675b05f3e6a7ce10960b4 100644 (file)
--- a/bin/megatron/macbin.c
+++ b/bin/megatron/macbin.c
@@ -1,5 +1,5 @@
 /*
- * $Id: macbin.c,v 1.10.10.1 2004-08-10 13:37:18 bfernhomberg Exp $
+ * $Id: macbin.c,v 1.10.10.1.2.1 2005-02-06 10:16:00 didg Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -185,9 +185,9 @@ int bin_read( fork, buffer, length )
     fprintf( stderr, "bin_read: remaining length is %d\n", bin.forklen[fork] );
 #endif /* DEBUG >= 3 */
 
-    if ( bin.forklen[ fork ] < 0 ) {
-       fprintf( stderr, "This should never happen, dude!\n" );
-       return( bin.forklen[ fork ] );
+    if (bin.forklen[fork] > length) {
+       fprintf(stderr, "This should never happen, dude! length %d, fork length == %u\n", length, bin.forklen[fork]);
+       return bin.forklen[fork];
     }
 
     if ( bin.forklen[ fork ] == 0 ) {
@@ -286,13 +286,14 @@ int bin_write( fork, buffer, length )
        perror( "Couldn't write to macbinary file:" );
        return( cc );
     }
-    bin.forklen[ fork ] -= length;
 
-    if ( bin.forklen[ fork ] < 0 ) {
-       fprintf( stderr, "This should never happen, dude!\n" );
-       return( bin.forklen[ fork ] );
+    if (length > bin.forklen[fork]) {
+       fprintf(stderr, "This should never happen, dude! length %d, fork length %u\n", length, bin.forklen[fork]);
+       return bin.forklen[fork];
     }
 
+    bin.forklen[fork] -= length;
+
 /*
  * add the padding at end of data and resource forks
  */

diff --git a/bin/uniconv/iso8859_1_adapted.c b/bin/uniconv/iso8859_1_adapted.c
index e7829665f6dd2ca9beaa6e7f1ce181623c62b451..70a895a59eb8418f730a6a09b48b50dd07b3d22c 100644 (file)
--- a/bin/uniconv/iso8859_1_adapted.c
+++ b/bin/uniconv/iso8859_1_adapted.c
@@ -39,7 +39,8 @@ struct charset_functions charset_iso8859_adapted =
        0,
        iso8859_adapted_pull,
        iso8859_adapted_push,
-       CHARSET_MULTIBYTE | CHARSET_PRECOMPOSED
+       CHARSET_MULTIBYTE | CHARSET_PRECOMPOSED,
+       NULL, NULL
 };
 
 

diff --git a/etc/afpd/appl.c b/etc/afpd/appl.c
index fe4c4909fd8a56ac23b0e85c690d71aa5ae21691..855c4a9191b357df3f9ff40dc37793b6eee0cda8 100644 (file)
--- a/etc/afpd/appl.c
+++ b/etc/afpd/appl.c
@@ -1,5 +1,5 @@
 /*
- * $Id: appl.c,v 1.12.2.1.2.2 2004-02-20 21:22:57 didg Exp $
+ * $Id: appl.c,v 1.12.2.1.2.2.2.1 2005-02-06 10:16:00 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -27,7 +27,7 @@
 #include "file.h"
 #include "desktop.h"
 
-static struct savedt   sa = { { 0, 0, 0, 0 }, -1, 0 };
+static struct savedt   sa = { { 0, 0, 0, 0 }, -1, 0, 0};
 
 static __inline__ int pathcmp( p, plen, q, qlen )
 char   *p;
@@ -41,6 +41,8 @@ int   qlen;
 static int applopen( vol, creator, flags, mode )
 struct vol     *vol;
 u_char creator[ 4 ];
+int flags;
+int mode;
 {
     char       *dtf, *adt, *adts;
 

diff --git a/etc/afpd/catsearch.c b/etc/afpd/catsearch.c
index b3817247671bd7f1ecf971bad7f3758d8beb944b..6c7241f4a16d51ea4b981f9f396c61971fb29cb9 100644 (file)
--- a/etc/afpd/catsearch.c
+++ b/etc/afpd/catsearch.c
@@ -398,6 +398,7 @@ static int crit_check(struct vol *vol, struct path *path, int cidx) {
                        attrs = finfo->attrs;
                }
                else if (*path->u_name == '.') {
+                       /* FIXME 0x4000 becomes 0x00 on bigendian */
                        attrs = htons(FINDERINFO_INVISIBLE);
                }
 

diff --git a/etc/afpd/desktop.c b/etc/afpd/desktop.c
index 82e8852ca5d6e2f12b9bb961e741cf3206ad4f83..913f5c7765ab2faa130722c6c3baf6676d2cea47 100644 (file)
--- a/etc/afpd/desktop.c
+++ b/etc/afpd/desktop.c
@@ -1,5 +1,5 @@
 /*
- * $Id: desktop.c,v 1.26.2.4.2.18 2004-10-09 12:48:21 didg Exp $
+ * $Id: desktop.c,v 1.26.2.4.2.18.2.1 2005-02-06 10:16:01 didg Exp $
  *
  * See COPYRIGHT.
  *
@@ -70,7 +70,7 @@ int           ibuflen, *rbuflen;
     return( AFP_OK );
 }
 
-struct savedt  si = { { 0, 0, 0, 0 }, -1, 0 };
+struct savedt  si = { { 0, 0, 0, 0 }, -1, 0, 0 };
 
 static char *icon_dtfile(struct vol *vol, u_char creator[ 4 ])
 {
@@ -80,6 +80,8 @@ static char *icon_dtfile(struct vol *vol, u_char creator[ 4 ])
 static int iconopen( vol, creator, flags, mode )
 struct vol     *vol;
 u_char creator[ 4 ];
+int flags;
+int mode;
 {
     char       *dtf, *adt, *adts;
 

diff --git a/etc/afpd/volume.c b/etc/afpd/volume.c
index 79ac3396ff715bcb10539cb33113b55f035b441e..c68ac3d492a7c2de4d43f12565d31879fe424192 100644 (file)
--- a/etc/afpd/volume.c
+++ b/etc/afpd/volume.c
@@ -1,5 +1,5 @@
 /*
- * $Id: volume.c,v 1.51.2.7.2.33.2.2 2004-12-10 13:33:34 didg Exp $
+ * $Id: volume.c,v 1.51.2.7.2.33.2.3 2005-02-06 10:16:01 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -1407,7 +1407,7 @@ int               *buflen;
 }
 
 /* ------------------------- */
-int static stat_vol(u_int16_t bitmap, struct vol *vol, char *rbuf, int *rbuflen)
+static int stat_vol(u_int16_t bitmap, struct vol *vol, char *rbuf, int *rbuflen)
 {
     struct stat        st;
     int                buflen, ret;

diff --git a/etc/atalkd/config.c b/etc/atalkd/config.c
index 37afeea455031dad2cc656b9e97b7ef8b10c4e0c..8a32cbb58cece96b28566b1aac1c473db49f4ed5 100644 (file)
--- a/etc/atalkd/config.c
+++ b/etc/atalkd/config.c
@@ -1,5 +1,5 @@
 /*
- * $Id: config.c,v 1.13.6.5.2.2 2005-01-31 19:50:40 didg Exp $
+ * $Id: config.c,v 1.13.6.5.2.3 2005-02-06 10:16:02 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved. See COPYRIGHT.
@@ -328,7 +328,7 @@ int readconf( cf )
     struct interface   *iface, *niface;
     char               line[ MAXLINELEN ], **argv, *p;
     unsigned int       i, j;
-    int                        s, cc;
+    int                        s, cc = 0;
     FILE               *conf;
 
     if ( cf == NULL ) {

diff --git a/etc/papd/auth.c b/etc/papd/auth.c
index 70dd04ad038e11db8886be7ade9e9385d0104a8e..5dbc573f26e99347d1ef48298f79b62cfa7bf33a 100644 (file)
--- a/etc/papd/auth.c
+++ b/etc/papd/auth.c
@@ -1,5 +1,5 @@
 /*
- * $Id: auth.c,v 1.6.8.2 2004-02-14 00:30:51 didg Exp $
+ * $Id: auth.c,v 1.6.8.2.2.1 2005-02-06 10:16:02 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -31,11 +31,11 @@
 #include "uam_auth.h"
 
 static struct uam_mod uam_modules = {NULL, NULL, &uam_modules, &uam_modules};
-static struct uam_obj uam_login = {"", "", 0, {{NULL}}, &uam_login,
+static struct uam_obj uam_login = {"", "", 0, {{NULL, NULL}}, &uam_login,
                                   &uam_login};
-static struct uam_obj uam_changepw = {"", "", 0, {{NULL}}, &uam_changepw, 
+static struct uam_obj uam_changepw = {"", "", 0, {{NULL, NULL}}, &uam_changepw, 
                                      &uam_changepw};
-static struct uam_obj uam_printer = {"", "", 0, {{NULL}}, &uam_printer,
+static struct uam_obj uam_printer = {"", "", 0, {{NULL, NULL}}, &uam_printer,
                                        &uam_printer};
 
 

diff --git a/etc/papd/headers.c b/etc/papd/headers.c
index 04f16471f238b023ae84651c562783024560ec23..bc1c887fb514ccf9e601494fe6786ec8e559c8a7 100644 (file)
--- a/etc/papd/headers.c
+++ b/etc/papd/headers.c
@@ -1,5 +1,5 @@
 /*
- * $Id: headers.c,v 1.9.10.1 2004-06-09 01:25:53 bfernhomberg Exp $
+ * $Id: headers.c,v 1.9.10.1.2.1 2005-02-06 10:16:02 didg Exp $
  *
  * Copyright (c) 1990,1994 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -297,24 +297,24 @@ int ch_translateone(in,out)
  * "Header" comments.
  */
 struct papd_comment    headers[] = {
-    { "%%Title:",                      0,              ch_title,       0 },
-    { "%%For:",                                0,              ch_for,         0 },
-    { "%%Creator:",                    0,              ch_creator,     0 },
-    { "%%EndComments",                 0,              ch_endcomm,     0 },
-    { "%%BeginFeature",                        0,              ch_starttranslate,  0 },
-    { "%%EndFeature",                  0,              ch_endtranslate,  0 },
-    { "%%BeginPageSetup",              0,              ch_starttranslate, 0 },
-    { "%%EndPageSetup",                        0,              ch_endtranslate, 0 },
+    { "%%Title:",                      NULL,           ch_title,       0 },
+    { "%%For:",                                NULL,           ch_for,         0 },
+    { "%%Creator:",                    NULL,           ch_creator,     0 },
+    { "%%EndComments",                 NULL,           ch_endcomm,     0 },
+    { "%%BeginFeature",                        NULL,           ch_starttranslate,  0 },
+    { "%%EndFeature",                  NULL,           ch_endtranslate,  0 },
+    { "%%BeginPageSetup",              NULL,           ch_starttranslate, 0 },
+    { "%%EndPageSetup",                        NULL,           ch_endtranslate, 0 },
 #if 0
-    { "%%BeginSetup",                  0,              ch_translateone,  0 },
-    { "%%EndSetup",                    0,              ch_translateone,  0 },
-    { "%%BeginProlog",                 0,              ch_translateone,  0 },
-    { "%%EndProlog",                   0,              ch_translateone,  0 },
-    { "%%Page:",                       0,              ch_translateone, 0 },
-    { "%%PageTrailer",                 0,              ch_translateone, 0 },
-    { "%%Trailer",                     0,              ch_translateone, 0 },
-    { "%%EOF",                         0,              ch_translateone, 0 },
+    { "%%BeginSetup",                  NULL,           ch_translateone,  0 },
+    { "%%EndSetup",                    NULL,           ch_translateone,  0 },
+    { "%%BeginProlog",                 NULL,           ch_translateone,  0 },
+    { "%%EndProlog",                   NULL,           ch_translateone,  0 },
+    { "%%Page:",                       NULL,           ch_translateone, 0 },
+    { "%%PageTrailer",                 NULL,           ch_translateone, 0 },
+    { "%%Trailer",                     NULL,           ch_translateone, 0 },
+    { "%%EOF",                         NULL,           ch_translateone, 0 },
 #endif
-    { "%%",                            0,              ch_translateone, 0 },
-    { 0 },
+    { "%%",                            NULL,           ch_translateone, 0 },
+    { NULL,                            NULL,           NULL,           0 },
 };

diff --git a/etc/papd/magics.c b/etc/papd/magics.c
index 23d37bb64b2f96b1b32497c87834e9b05a346ec3..c939060bbee3972ac2622ff01634a67d11dac9e7 100644 (file)
--- a/etc/papd/magics.c
+++ b/etc/papd/magics.c
@@ -1,5 +1,5 @@
 /*
- * $Id: magics.c,v 1.11.6.2 2004-08-23 22:31:58 bfernhomberg Exp $
+ * $Id: magics.c,v 1.11.6.2.2.1 2005-02-06 10:16:02 didg Exp $
  *
  * Copyright (c) 1990,1994 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -208,8 +208,8 @@ int cm_psswitch( in, out, sat )
 
 
 struct papd_comment    magics[] = {
-    { "%!PS-Adobe-3.0 Query",  0,                      cm_psquery, C_FULL },
-    { "%!PS-Adobe-3.0",                0,                      cm_psadobe, C_FULL },
-    { "%!PS-Adobe-",           0,                      cm_psswitch,    0 },
-    { 0 },
+    { "%!PS-Adobe-3.0 Query",  NULL,                   cm_psquery, C_FULL },
+    { "%!PS-Adobe-3.0",                NULL,                   cm_psadobe, C_FULL },
+    { "%!PS-Adobe-",           NULL,                   cm_psswitch,    0 },
+    { NULL,                    NULL,                   NULL,           0 },
 };

diff --git a/etc/papd/ppd.c b/etc/papd/ppd.c
index 5d2aa5d70190b945f55cadd719129473e57bee40..b1b97683baf5aa9eeab879b371a9ac1789d3fbc2 100644 (file)
--- a/etc/papd/ppd.c
+++ b/etc/papd/ppd.c
@@ -1,5 +1,5 @@
 /*
- * $Id: ppd.c,v 1.9.8.1.2.1 2005-01-31 17:01:07 didg Exp $
+ * $Id: ppd.c,v 1.9.8.1.2.2 2005-02-06 10:16:02 didg Exp $
  *
  * Copyright (c) 1995 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -71,7 +71,7 @@ static char* my_fgets(buf, bufsize, stream)
     size_t bufsize;
     FILE   *stream;
 {
-    char p;           /* uninitialized, OK 310105 */
+    int p;           /* uninitialized, OK 310105 */
     size_t count = 0;
  
     while (count < bufsize && EOF != (p=fgetc(stream))) {

diff --git a/etc/papd/queries.c b/etc/papd/queries.c
index 5c056823911166ef6fa80483dd3a376f0aecd44e..69ed8ad6d97b89a248bc8d5ba6a1a1401f35d051 100644 (file)
--- a/etc/papd/queries.c
+++ b/etc/papd/queries.c
@@ -1,5 +1,5 @@
 /*
- * $Id: queries.c,v 1.16.2.1.2.1 2004-06-09 01:25:54 bfernhomberg Exp $
+ * $Id: queries.c,v 1.16.2.1.2.1.2.1 2005-02-06 10:16:02 didg Exp $
  *
  * Copyright (c) 1990,1994 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -307,7 +307,7 @@ struct genquery {
     { "ADOIsBinaryOK?", gq_true },
     { "UMICHListQueue", gq_true },
     { "UMICHDeleteJob", gq_true },
-    { NULL },
+    { NULL, NULL },
 };
 
 int cq_query( in, out )
@@ -749,18 +749,18 @@ int cq_rbilogin( in, out )
  */
 struct papd_comment    queries[] = {
 #ifdef KRB
-    { "%%Login: UMICHKerberosIV", 0,                   cq_k4login,     0 },
-    { "%%?BeginUAMethodsQuery",        "%%?EndUAMethodsQuery:", cq_uameth, C_FULL },
+    { "%%Login: UMICHKerberosIV", NULL,                        cq_k4login,     0 },
+    { "%%?BeginUAMethodsQuery",        "%%?EndUAMethodsQuery:", cq_uameth,C_FULL },
 #endif /* KRB */
 #ifndef HAVE_CUPS
-    { "%UMICHListQueue", 0,                            cq_listq, C_FULL },
-    { "%UMICHDeleteJob", 0,                            cq_rmjob,       0 },
+    { "%UMICHListQueue",       NULL,                   cq_listq,  C_FULL },
+    { "%UMICHDeleteJob",       NULL,                   cq_rmjob,       0 },
 #endif /* HAVE_CUPS */
     { "%%?BeginQuery: RBILogin ", "%%?EndQuery",       cq_rbilogin,    0 },
     { "%%?BeginQuery",         "%%?EndQuery",          cq_query,       0 },
     { "%%?BeginFeatureQuery",  "%%?EndFeatureQuery",   cq_feature,     0 },
     { "%%?BeginFontQuery",     "%%?EndFontQuery",      cq_font,        0 },
-    { "%%?BeginPrinterQuery",  "%%?EndPrinterQuery",   cq_printer, C_FULL },
+    { "%%?BeginPrinterQuery",  "%%?EndPrinterQuery",   cq_printer,C_FULL },
     { "%%?Begin",              "%%?End",               cq_default,     0 },
-    { 0 },
+    { NULL,                    NULL,                   NULL,           0 },
 };

diff --git a/libatalk/cnid/dbd/cnid_dbd.c b/libatalk/cnid/dbd/cnid_dbd.c
index e89af69ac76b1f7a95d7210352b598e8608b0529..9f32950b4a4ab033bfc208904bedd7744ffe268a 100644 (file)
--- a/libatalk/cnid/dbd/cnid_dbd.c
+++ b/libatalk/cnid/dbd/cnid_dbd.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_dbd.c,v 1.1.4.18.2.1 2005-01-30 20:56:22 didg Exp $
+ * $Id: cnid_dbd.c,v 1.1.4.18.2.2 2005-02-06 10:16:03 didg Exp $
  *
  * Copyright (C) Joerg Lenneis 2003
  * All Rights Reserved.  See COPYING.
@@ -794,6 +794,7 @@ struct _cnid_module cnid_dbd_module = {
     "dbd",
     {NULL, NULL},
     cnid_dbd_open,
+    0
 };
 
 #endif /* CNID_DBD */

diff --git a/libatalk/cnid/last/cnid_last.c b/libatalk/cnid/last/cnid_last.c
index e0848701c13523cb5645ba118377a10917cd3857..64160e300793c05e08c353796610c7e743bc2e44 100644 (file)
--- a/libatalk/cnid/last/cnid_last.c
+++ b/libatalk/cnid/last/cnid_last.c
@@ -1,6 +1,6 @@
 
 /*
- * $Id: cnid_last.c,v 1.1.4.1.2.1 2005-01-30 20:56:23 didg Exp $
+ * $Id: cnid_last.c,v 1.1.4.1.2.2 2005-02-06 10:16:03 didg Exp $
  *
  * Copyright (c) 1999. Adrian Sun (asun@zoology.washington.edu)
  * All Rights Reserved. See COPYRIGHT.
@@ -163,6 +163,7 @@ struct _cnid_module cnid_last_module = {
     "last",
     {NULL, NULL},
     cnid_last_open,
+    0
 };
 
 /* Return the did/name pair corresponding to a CNID. */

diff --git a/libatalk/unicode/charsets/mac_centraleurope.c b/libatalk/unicode/charsets/mac_centraleurope.c
index a6397e8f97aa8b7e01cb50f9423a8ebf60f1e8b1..f47e9f1d9189d623b322429be3b50a4b422c138d 100644 (file)
--- a/libatalk/unicode/charsets/mac_centraleurope.c
+++ b/libatalk/unicode/charsets/mac_centraleurope.c
@@ -43,7 +43,8 @@ struct charset_functions charset_mac_centraleurope =
        29,
        mac_centraleurope_pull,
        mac_centraleurope_push,
-       CHARSET_CLIENT | CHARSET_MULTIBYTE      
+       CHARSET_CLIENT | CHARSET_MULTIBYTE,
+       NULL, NULL
 };
 
 

diff --git a/libatalk/unicode/charsets/mac_cyrillic.c b/libatalk/unicode/charsets/mac_cyrillic.c
index f344fe0fe16e878372dff457aa2d49a376dc3fa5..9d3e0c1235d4bb24a740452d25770bd38063308e 100644 (file)
--- a/libatalk/unicode/charsets/mac_cyrillic.c
+++ b/libatalk/unicode/charsets/mac_cyrillic.c
@@ -44,7 +44,8 @@ struct charset_functions charset_mac_cyrillic =
        7,
        mac_cyrillic_pull,
        mac_cyrillic_push,
-       CHARSET_CLIENT | CHARSET_MULTIBYTE      
+       CHARSET_CLIENT | CHARSET_MULTIBYTE,
+       NULL, NULL
 };
 
 

diff --git a/libatalk/unicode/charsets/mac_hebrew.c b/libatalk/unicode/charsets/mac_hebrew.c
index 9ea31868f5c21552b3016390fe1131cbca50617f..589a43bb394c2f28dcd1ac2eddfd890bc324f5d9 100644 (file)
--- a/libatalk/unicode/charsets/mac_hebrew.c
+++ b/libatalk/unicode/charsets/mac_hebrew.c
@@ -47,7 +47,8 @@ struct charset_functions charset_mac_hebrew =
        5,
        mac_hebrew_pull,
        mac_hebrew_push,
-       CHARSET_CLIENT | CHARSET_MULTIBYTE      
+       CHARSET_CLIENT | CHARSET_MULTIBYTE,
+       NULL, NULL
 };
 
 

diff --git a/libatalk/unicode/charsets/mac_roman.c b/libatalk/unicode/charsets/mac_roman.c
index f1ab31e0a53115d737d4e3b09d71893e3a1b0849..caf9a65834e762fbb596a87f1c2f038297de5f76 100644 (file)
--- a/libatalk/unicode/charsets/mac_roman.c
+++ b/libatalk/unicode/charsets/mac_roman.c
@@ -44,7 +44,8 @@ struct charset_functions charset_mac_roman =
        0,
        mac_roman_pull,
        mac_roman_push,
-       CHARSET_CLIENT | CHARSET_MULTIBYTE | CHARSET_PRECOMPOSED
+       CHARSET_CLIENT | CHARSET_MULTIBYTE | CHARSET_PRECOMPOSED,
+       NULL, NULL
 };
 
 /* ------------------------ */

diff --git a/libatalk/unicode/charsets/mac_turkish.c b/libatalk/unicode/charsets/mac_turkish.c
index 5406ab022a7ab70cdb20395a855eb2786fcdc61e..33431d4b798dec54b63bfd9e80eb1683cb7bfce4 100644 (file)
--- a/libatalk/unicode/charsets/mac_turkish.c
+++ b/libatalk/unicode/charsets/mac_turkish.c
@@ -43,7 +43,8 @@ struct charset_functions charset_mac_turkish =
        35,
        mac_turkish_pull,
        mac_turkish_push,
-       CHARSET_CLIENT | CHARSET_MULTIBYTE      
+       CHARSET_CLIENT | CHARSET_MULTIBYTE,
+       NULL, NULL
 };
 
 static size_t mac_turkish_push( void *cd, char **inbuf, size_t *inbytesleft,

diff --git a/libatalk/unicode/iconv.c b/libatalk/unicode/iconv.c
index c5657de66245ab1658ba6101704cfeba868ffa23..21f9d4f82a43a95cdb2467063e4f8242c26c5853 100644 (file)
--- a/libatalk/unicode/iconv.c
+++ b/libatalk/unicode/iconv.c
@@ -98,10 +98,10 @@ extern  struct charset_functions charset_utf8_mac;
 
 
 static struct charset_functions builtin_functions[] = {
-       {"UCS-2",   0, iconv_copy, iconv_copy, CHARSET_WIDECHAR | CHARSET_PRECOMPOSED},
-       {"ASCII",     0, ascii_pull, ascii_push, CHARSET_MULTIBYTE | CHARSET_PRECOMPOSED},
-       {"SHIFT_JIS", 1568, NULL, NULL, CHARSET_ICONV | CHARSET_PRECOMPOSED | CHARSET_CLIENT},
-       {NULL, 0, NULL, NULL, 0}
+       {"UCS-2",   0, iconv_copy, iconv_copy, CHARSET_WIDECHAR | CHARSET_PRECOMPOSED, NULL, NULL},
+       {"ASCII",     0, ascii_pull, ascii_push, CHARSET_MULTIBYTE | CHARSET_PRECOMPOSED, NULL, NULL},
+       {"SHIFT_JIS", 1568, NULL, NULL, CHARSET_ICONV | CHARSET_PRECOMPOSED | CHARSET_CLIENT, NULL, NULL},
+       {NULL, 0, NULL, NULL, 0, NULL, NULL}
 };
 
 

diff --git a/libatalk/unicode/utf8.c b/libatalk/unicode/utf8.c
index 452acf6922ba48e1b65dad7cf38d140ab7625459..bc448c7aa77a0aa7967a01472e6b28e30df03b4d 100644 (file)
--- a/libatalk/unicode/utf8.c
+++ b/libatalk/unicode/utf8.c
@@ -46,7 +46,8 @@ struct charset_functions charset_utf8 =
        0x08000103,
        utf8_pull,
        utf8_push,
-       CHARSET_VOLUME | CHARSET_MULTIBYTE | CHARSET_PRECOMPOSED
+       CHARSET_VOLUME | CHARSET_MULTIBYTE | CHARSET_PRECOMPOSED,
+       NULL, NULL
 };
 
 struct charset_functions charset_utf8_mac =
@@ -55,7 +56,8 @@ struct charset_functions charset_utf8_mac =
        0x08000103,
        utf8_pull,
        utf8_push,
-       CHARSET_VOLUME | CHARSET_CLIENT | CHARSET_MULTIBYTE | CHARSET_DECOMPOSED
+       CHARSET_VOLUME | CHARSET_CLIENT | CHARSET_MULTIBYTE | CHARSET_DECOMPOSED,
+       NULL, NULL
 };
 
 /* ------------------------ */