fixes

Netatalk · Nov 14, 2024 · eb5aecb · eb5aecb
1 parent 5c0ce75
commit eb5aecb
Showing 1 changed file with 8 additions and 12 deletions.
diff --git a/libatalk/cnid/sqlite/cnid_sqlite.c b/libatalk/cnid/sqlite/cnid_sqlite.c
@@ -91,22 +91,20 @@ static int init_prepared_stmt_add(CNID_sqlite_private * db)
 	char *sql = NULL;
 
 	EC_ZERO(sqlite3_finalize(db->cnid_add_stmt));
-	EC_NEG1(ret = asprintf(&sql,
+	EC_NEG1(asprintf(&sql,
 			 "INSERT INTO `%s` (Name,Did,DevNo,InodeNo) VALUES(?,?,?,?)",
 			 db->cnid_sqlite_voluuid_str) );
 
 	EC_ZERO_LOG(sqlite3_prepare_v2
 		    (db->cnid_sqlite_con, sql, strlen(sql), &db->cnid_put_stmt, NULL));
-	EC_ZERO_LOG(sqlite3_bind_int64(db->cnid_add_stmt,
-		    1, stmt_param_id) );
 	EC_ZERO_LOG(sqlite3_bind_text(db->cnid_add_stmt,
-		    2, stmt_param_name, strlen(stmt_param_name), SQLITE_STATIC) );
+		    1, stmt_param_name, strlen(stmt_param_name), SQLITE_STATIC) );
 	EC_ZERO_LOG(sqlite3_bind_int64(db->cnid_add_stmt,
-		    3, stmt_param_did) );
+		    2, stmt_param_did) );
 	EC_ZERO_LOG(sqlite3_bind_int64(db->cnid_add_stmt,
-		    4, stmt_param_dev) );
+		    3, stmt_param_dev) );
 	EC_ZERO_LOG(sqlite3_bind_int64(db->cnid_add_stmt,
-		    5, stmt_param_ino) );
+		    4, stmt_param_ino) );
 
 EC_CLEANUP:
 	if (sql)
@@ -120,7 +118,7 @@ static int init_prepared_stmt_put(CNID_sqlite_private * db)
 	char *sql = NULL;
 
 	EC_ZERO(sqlite3_finalize(db->cnid_put_stmt));
-	EC_NEG1(ret = asprintf(&sql,
+	EC_NEG1(asprintf(&sql,
 			 "INSERT INTO `%s` (Id,Name,Did,DevNo,InodeNo) VALUES(?,?,?,?,?)",
 			 db->cnid_sqlite_voluuid_str));
 
@@ -909,10 +907,8 @@ struct _cnid_db *cnid_sqlite_open(struct cnid_open_args *args)
 			EC_FAIL;
 		}
 	}
-#endif
 	sqlite3_finalize(transient_stmt);
 
-#if 0 // FIXME
 	/*
 	 * Check whether CNID set overflowed before.
 	 * If that's the case, in cnid_sqlite_add() we'll ignore the CNID
@@ -964,11 +960,11 @@ struct _cnid_db *cnid_sqlite_open(struct cnid_open_args *args)
 		EC_FAIL;
 	}
 
-	EC_ZERO(init_prepared_stmt(db));
+	init_prepared_stmt(db);
 
 	LOG(log_debug, logtype_cnid,
 	    "Finished initializing sqlite CNID module for volume '%s'",
-	    vol);
+	    vol->v_path);
 
 EC_CLEANUP:
 	if (transient_stmt)