Big configure.in cleanup

[netatalk.git] / bin / nbp / nbpunrgstr.c

diff --git a/bin/nbp/nbpunrgstr.c b/bin/nbp/nbpunrgstr.c
index b9cd23478144ceda9513c920afebd2ce4ef9061a..a4a946530f21e7fe9de6d06e1aeccddbdc631d60 100644 (file)
--- a/bin/nbp/nbpunrgstr.c
+++ b/bin/nbp/nbpunrgstr.c
@@ -1,5 +1,5 @@
 /*
- * $Id: nbpunrgstr.c,v 1.7 2009-10-13 22:55:36 didg Exp $
+ * $Id: nbpunrgstr.c,v 1.10 2009-10-29 11:35:58 didg Exp $
  *
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
  * All Rights Reserved.
@@ -41,11 +41,11 @@
 
 #include <atalk/unicode.h>
 
-void Usage(char *av0)
+static void Usage(char *av0)
 {
     char       *p;
 
-    if (( p = strrchr( av0, '/' )) == 0 ) {
+    if (( p = strrchr( av0, '/' )) == NULL ) {
        p = av0;
     } else {
        p++;
@@ -57,8 +57,8 @@ void Usage(char *av0)
 
 int main(int ac, char **av)
 {
-    char               *Obj = 0, *Type = 0, *Zone = 0;
-    char               *convname = 0;
+    char               *Obj = NULL, *Type = NULL, *Zone = NULL;
+    char               *convname = NULL;
     struct at_addr      addr;
     int                 c;
     charset_t          chMac = CH_MAC;
@@ -94,7 +94,7 @@ int main(int ac, char **av)
 
     /* Convert the name */
     if ((size_t)(-1) == convert_string_allocate(CH_UNIX, chMac, 
-                        av[optind], strlen(av[optind]), &convname))
+                        av[optind], -1, &convname))
         convname = av[optind]; 
 
     /*