X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=bin%2Funiconv%2Funiconv.c;h=93439cefa965efae35bab8255d0c97d7d1f04780;hb=f254fd618b53e97cc5382b23709d4f3de1e70b41;hp=5dfc823115bef5ea6f960d7429ce81012d0e559a;hpb=313b5f94348618d65523c1d8bde1fba9988f040a;p=netatalk.git

diff --git a/bin/uniconv/uniconv.c b/bin/uniconv/uniconv.c
index 5dfc8231..93439cef 100644
--- a/bin/uniconv/uniconv.c
+++ b/bin/uniconv/uniconv.c
@@ -60,7 +60,7 @@ char* to_charset;
 static charset_t ch_mac;
 char* mac_charset;
 static int usedots = 0;
-static u_int16_t conv_flags = 0;
+static uint16_t conv_flags = 0;
 static int dry_run = 0;
 static int verbose=0;
 char *cnid_type;
@@ -149,7 +149,7 @@ static char *convert_name(char *name, struct stat *st, cnid_t cur_did)
 	size_t outlen = 0;
 	unsigned char *p,*q;
 	int require_conversion = 0;
-    u_int16_t    flags = conv_flags;
+    uint16_t    flags = conv_flags;
 	cnid_t id;
 
 	p = (unsigned char *)name;
@@ -389,7 +389,7 @@ static int init(char* path)
 {
 	DIR* startdir;
 
-    if (NULL == (cdb = cnid_open (path, 0, cnid_type, 0, "localhost", "4700")) ) {
+    if (NULL == (cdb = cnid_open (path, 0, cnid_type, 0, "localhost", "4700", NULL, NULL)) ) {
                 fprintf (stderr, "ERROR: cannot open CNID database in '%s'\n", path);
                 fprintf (stderr, "ERROR: check the logs for reasons, aborting\n");
 		return -1;