fixes

Author: rdmark

libatalk/cnid/sqlite/cnid_sqlite.c

@@ -39,8 +39,6 @@
 
 
 sqlite3_stmt *stmt = NULL;
-// CK static MYSQL_BIND lookup_param[4], lookup_result[5];
-// CK static MYSQL_BIND add_param[4], put_param[5];
 
 /*
  * Prepared statement parameters
@@ -248,7 +246,7 @@ void cnid_sqlite_close(struct _cnid_db *cdb)
 int cnid_sqlite_update(struct _cnid_db *cdb,
 		      cnid_t id,
 		      const struct stat *st,
-		      const cnid_t did, char *name, size_t len)
+		      cnid_t did, const char *name, size_t len)
 {
 	EC_INIT;
 	CNID_sqlite_private *db;
@@ -320,7 +318,7 @@ int cnid_sqlite_update(struct _cnid_db *cdb,
 
 cnid_t cnid_sqlite_lookup(struct _cnid_db *cdb,
 			  const struct stat *st,
-			  const cnid_t did, char *name, const size_t len)
+			  cnid_t did, const char *name, size_t len)
 {
 	EC_INIT;
 
@@ -530,7 +528,7 @@ cnid_t cnid_sqlite_add(struct _cnid_db *cdb,
 
 			lastid = sqlite3_last_insert_rowid(db->cnid_sqlite_con);
 
-			if (lastid > 0xffffffff) { /* CK this is wrong */
+			if (lastid > 0xffffffff) { /* FIXME: this is wrong */
 				/* CNID set is depleted, restart from scratch */
 				EC_NEG1(cnid_sqlite_execute
 					(db->cnid_sqlite_con,
@@ -563,15 +561,15 @@ cnid_t cnid_sqlite_add(struct _cnid_db *cdb,
 		}
 	} while (id == CNID_INVALID);
 
-      EC_CLEANUP:
+EC_CLEANUP:
 	LOG(log_debug, logtype_cnid, "cnid_sqlite_add: id: %" PRIu32,
 	    ntohl(id));
 
 	return id;
 }
 
-cnid_t cnid_sqlite_get(struct _cnid_db *cdb, const cnid_t did, char *name,
-		      const size_t len)
+cnid_t cnid_sqlite_get(struct _cnid_db *cdb, cnid_t did, const char *name,
+		      size_t len)
 {
 	EC_INIT;
 	CNID_sqlite_private *db;
@@ -663,7 +661,7 @@ char *cnid_sqlite_resolve(struct _cnid_db *cdb, cnid_t * id, void *buffer,
 	if (transient_stmt)
 		sqlite3_finalize(transient_stmt);
 
-#if 0 // handle this CK
+#if 0 // FIXME: handle this
 	if (ret != 0) {
 		*id = CNID_INVALID;
 		return NULL;
@@ -728,7 +726,7 @@ int cnid_sqlite_find(struct _cnid_db *cdb, const char *name, size_t namelen,
 }
 
 cnid_t cnid_sqlite_rebuild_add(struct _cnid_db *cdb, const struct stat *st,
-			      const cnid_t did, char *name, const size_t len,
+			      cnid_t did, const char *name, size_t len,
 			      cnid_t hint)
 {
 	LOG(log_error, logtype_cnid,
@@ -775,7 +773,6 @@ static struct _cnid_db *cnid_sqlite_new(struct vol *vol)
 
 	cdb->cnid_db_vol = vol;
 	cdb->cnid_db_flags = CNID_FLAG_PERSISTENT | CNID_FLAG_LAZY_INIT;
-
 	cdb->cnid_add = cnid_sqlite_add;
 	cdb->cnid_delete = cnid_sqlite_delete;
 	cdb->cnid_get = cnid_sqlite_get;
@@ -857,7 +854,7 @@ struct _cnid_db *cnid_sqlite_open(struct cnid_open_args *args)
 		    strlen(stamp), SQLITE_STATIC) );
 
 	sqlite3_step(transient_stmt);
-#if 0 // CK must figure out how to check for failed insert
+#if 0 // FIXME: must figure out how to check for failed insert
 	if (sqlite3_step(transient_stmt)) {
 		if (mysql_errno(db->cnid_sqlite_con) != ER_DUP_ENTRY) {
 			LOG(log_error, logtype_cnid,
@@ -869,7 +866,7 @@ struct _cnid_db *cnid_sqlite_open(struct cnid_open_args *args)
 #endif
 	sqlite3_finalize(transient_stmt);
 
-#if 0 // CK FIX!
+#if 0 // FIXME
 	/*
 	 * Check whether CNID set overflowed before.
 	 * If that's the case, in cnid_sqlite_add() we'll ignore the CNID