cnid_t is a unsigned variable, Joe! Thanks to Didier for pointing this out.

diff --git a/etc/afpd/enumerate.c b/etc/afpd/enumerate.c
index 199913fee298cc8f91f6b8c0af4dce76bea98af3..14549eab15ef5fb24f16d81f8e3dd85751fb92c9 100644 (file)
--- a/etc/afpd/enumerate.c
+++ b/etc/afpd/enumerate.c
@@ -1,5 +1,5 @@
 /*
- * $Id: enumerate.c,v 1.16 2002-01-29 21:12:14 jmarcus Exp $
+ * $Id: enumerate.c,v 1.17 2002-02-02 19:11:34 jmarcus Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -82,7 +82,7 @@ struct stat *st;
     cdir->d_did = cnid_add(vol->v_db, st, dir->d_did, upath,
                            upathlen, cdir->d_did);
     /* Fail out if things go bad with CNID. */
-    if (cdir->d_did < 0) {
+    if (cdir->d_did == CNID_INVALID) {
         switch (errno) {
         case CNID_ERR_PARAM:
             LOG(log_error, logtype_default, "adddir: Incorrect parameters passed to cnid_add");

diff --git a/etc/afpd/file.c b/etc/afpd/file.c
index 1908170230900808d697190a22c289fe6e4ad7d1..494bae014d54a3ab6726c6b76b933e11f46110e8 100644 (file)
--- a/etc/afpd/file.c
+++ b/etc/afpd/file.c
@@ -1,5 +1,5 @@
 /*
- * $Id: file.c,v 1.38 2002-01-29 21:12:14 jmarcus Exp $
+ * $Id: file.c,v 1.39 2002-02-02 19:11:33 jmarcus Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -225,7 +225,7 @@ int getfilparams(struct vol *vol,
             aint = cnid_add(vol->v_db, st, dir->d_did, upath,
                             strlen(upath), aint);
             /* Throw errors if cnid_add fails. */
-            if (aint < 0) {
+            if (aint == CNID_INVALID) {
                 switch (errno) {
                 case CNID_ERR_PARAM:
                     LOG(log_error, logtype_default, "getfilparams: Incorrect parameters passed to cnid_add");
@@ -1367,7 +1367,7 @@ int               ibuflen, *rbuflen;
     }
 #endif /* AD_VERSION > AD_VERSION1 */
 
-    if (id = cnid_add(vol->v_db, &st, did, upath, len, id)) {
+    if (id = cnid_add(vol->v_db, &st, did, upath, len, id) != CNID_INVALID) {
         memcpy(rbuf, &id, sizeof(id));
         *rbuflen = sizeof(id);
         return AFP_OK;

diff --git a/etc/afpd/fork.c b/etc/afpd/fork.c
index b98c304d74693d38d125740c9059edbd9718de27..291972d0192f8c3cec0d9ded0a79b73e3c3f7c52 100644 (file)
--- a/etc/afpd/fork.c
+++ b/etc/afpd/fork.c
@@ -1,5 +1,5 @@
 /*
- * $Id: fork.c,v 1.19 2002-01-29 21:12:14 jmarcus Exp $
+ * $Id: fork.c,v 1.20 2002-02-02 19:11:34 jmarcus Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -191,7 +191,7 @@ const u_int16_t     attrbits;
             aint = cnid_add(ofork->of_vol->v_db, &st,
                             ofork->of_dir->d_did,
                             upath, strlen(upath), aint);
-            if (aint < 0) {
+            if (aint == CNID_INVALID) {
                 switch (errno) {
                 case CNID_ERR_PARAM:
                     LOG(log_error, logtype_default, "getforkparams: Incorrect parameters passed to cnid_add");

diff --git a/include/atalk/cnid.h b/include/atalk/cnid.h
index 29e428793aead488bf348a309e2aecbbd9ed83bf..43ac5006aa6eb0b7730524a00f961a8b97291ff3 100644 (file)
--- a/include/atalk/cnid.h
+++ b/include/atalk/cnid.h
@@ -13,6 +13,8 @@
 
 #include <netatalk/endian.h>
 
+#define CNID_INVALID   0
+
 #define CNID_ERR_PARAM 0x80000001
 #define CNID_ERR_PATH  0x80000002
 #define CNID_ERR_DB    0x80000003

diff --git a/libatalk/cnid/cnid_add.c b/libatalk/cnid/cnid_add.c
index ac209c592c633d6c5e04e8d41cf8afccd56317cc..816008ecfed8405720dc4978280c723a2bc4e51a 100644 (file)
--- a/libatalk/cnid/cnid_add.c
+++ b/libatalk/cnid/cnid_add.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_add.c,v 1.28 2002-02-01 19:51:09 jmarcus Exp $
+ * $Id: cnid_add.c,v 1.29 2002-02-02 19:11:37 jmarcus Exp $
  *
  * Copyright (c) 1999. Adrian Sun (asun@zoology.washington.edu)
  * All Rights Reserved. See COPYRIGHT.
@@ -120,7 +120,7 @@ cnid_t cnid_add(void *CNID, const struct stat *st,
 
     if (!(db = CNID) || !st || !name) {
         errno = CNID_ERR_PARAM;
-        return -1;
+        return CNID_INVALID;
     }
 
     /* Do a lookup. */
@@ -144,7 +144,7 @@ cnid_t cnid_add(void *CNID, const struct stat *st,
     if ((data.data = make_cnid_data(st, did, name, len)) == NULL) {
         LOG(log_error, logtype_default, "cnid_add: Path name is too long");
         errno = CNID_ERR_PATH;
-        return -1;
+        return CNID_INVALID;
     }
 
     data.size = CNID_HEADER_LEN + len + 1;
@@ -161,7 +161,7 @@ cnid_t cnid_add(void *CNID, const struct stat *st,
         default:
             LOG(log_error, logtype_default, "cnid_add: Unable to add CNID %u: %s", ntohl(hint), db_strerror(rc));
             errno = CNID_ERR_DB;
-            return -1;
+            return CNID_INVALID;
         case 0:
 #ifdef DEBUG
             LOG(log_info, logtype_default, "cnid_add: Used hint for did %u, name %s as %u", ntohl(did), name, ntohl(hint));
@@ -179,7 +179,7 @@ retry:
     if ((rc = txn_begin(db->dbenv, NULL, &tid, 0)) != 0) {
         LOG(log_error, logtype_default, "cnid_add: Failed to begin transaction: %s", db_strerror(rc));
         errno = CNID_ERR_DB;
-        return -1;
+        return CNID_INVALID;
     }
 
     /* Get the key. */
@@ -189,7 +189,7 @@ retry:
         if ((rc = txn_abort(tid)) != 0) {
             LOG(log_error, logtype_default, "cnid_add: txn_abort: %s", db_strerror(rc));
             errno = CNID_ERR_DB;
-            return -1;
+            return CNID_INVALID;
         }
         goto retry;
     case 0:
@@ -201,7 +201,7 @@ retry:
             txn_abort(tid);
             LOG(log_error, logtype_default, "cnid_add: FATAL: Cannot add CNID for %s.  CNID database has reached its limit.", name);
             errno = CNID_ERR_MAX;
-            return -1;
+            return CNID_INVALID;
         }
         hint = htonl(id);
 #ifdef DEBUG
@@ -227,7 +227,7 @@ retry:
         if ((rc = txn_abort(tid)) != 0) {
             LOG(log_error, logtype_default, "cnid_add: txn_abort: %s", db_strerror(rc));
             errno = CNID_ERR_DB;
-            return -1;
+            return CNID_INVALID; 
         }
         goto retry;
     case 0:
@@ -235,7 +235,7 @@ retry:
         if ((rc = txn_commit(tid, 0)) != 0) {
             LOG(log_error, logtype_default, "cnid_add: Unable to commit transaction: %s", db_strerror(rc));
             errno = CNID_ERR_DB;
-            return -1;
+            return CNID_INVALID;
         }
         break;
     default:
@@ -248,7 +248,7 @@ retry:
     if (rc) {
         LOG(log_error, logtype_default, "cnid_add: Failed to add CNID for %s to database using hint %u: %s", name, ntohl(hint), db_strerror(rc));
         errno = CNID_ERR_DB;
-        return -1;
+        return CNID_INVALID;
     }
 
 #ifdef DEBUG
@@ -261,7 +261,7 @@ cleanup_abort:
     txn_abort(tid);
 
     errno = CNID_ERR_DB;
-    return -1;
+    return CNID_INVALID;
 }
 #endif /* CNID_DB */