From ab6cbd925c8d5ac9fd80da8285cbb11e9e41fca8 Mon Sep 17 00:00:00 2001 From: Thomas Schmucker Date: Sat, 11 Jul 2026 23:02:44 +0200 Subject: Variablen und Funktionen besser benamt. --- src/db-test.c | 42 ++++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/src/db-test.c b/src/db-test.c index 1538702..97793f8 100644 --- a/src/db-test.c +++ b/src/db-test.c @@ -7,6 +7,7 @@ // Berkeley DB 1.85 #include +#define DATABASE_NAME "./database.db" #define MODE 0600 #define USERNAME_LENGTH 20 @@ -31,9 +32,9 @@ insert(DB *database) DBT data = { .data = &users[i], .size = sizeof(users[i]) }; DBT key = { .data = users[i].username, .size = strlen(users[i].username) }; - int res = database->put(database, &key, &data, 0); - if ( res == -1 ) { - (void) fprintf(stderr, "failed to insert data!\n"); + int error = database->put(database, &key, &data, 0); + if ( error ) { + (void) fprintf(stderr, "Datensatz konnte nicht eingefügt werden!\n"); } } } @@ -44,9 +45,9 @@ update(DB *database, const char *username, int new_age) DBT key = { .data = (void *) username, .size = strlen(username) }; DBT old_data; - int res = database->get(database, &key, &old_data, 0); - if ( res != 0 ) { - (void) fprintf(stderr, "update: Datensatz %s nicht gefunden!\n", username); + int error = database->get(database, &key, &old_data, 0); + if ( error ) { + (void) fprintf(stderr, "Datensatz %s nicht gefunden!\n", username); return; } @@ -60,20 +61,21 @@ update(DB *database, const char *username, int new_age) .size = sizeof user }; - res = database->put(database, &key, &new_data, 0); + error = database->put(database, &key, &new_data, 0); - if ( res != 0 ) { - (void) fprintf(stderr, "update: Datensatz %s wurde nicht aktualisiert\n", username); + if ( error ) { + (void) fprintf(stderr, "Datensatz %s wurde nicht aktualisiert\n", username); } } -void delete(DB *database, const char *username) +void +erase(DB *database, const char *username) { DBT key = { .data = (void *) username, .size = strlen(username) }; - int res = database->del(database, &key, 0); - if ( res != 0 ) { - (void) fprintf(stderr, "update: Datensatz %s wurde nicht gelöscht\n", username); + int error = database->del(database, &key, 0); + if ( error ) { + (void) fprintf(stderr, "Datensatz %s wurde nicht gelöscht\n", username); } } @@ -83,8 +85,8 @@ lookup(DB *database, const char *username) DBT key = { .data = (void *) username, .size = strlen(username) }; DBT data; - int res = database->get(database, &key, &data, 0); - if ( res == 0 ) { + int error = database->get(database, &key, &data, 0); + if ( !error ) { user_type *user = data.data; printf("%.*s -> %s (%d)\n", (int) key.size, (char *) key.data, user->fullname, user->age); } @@ -96,19 +98,19 @@ list(DB *database) DBT key; DBT data; - int err = database->seq(database, &key, &data, R_FIRST); - while ( !err ) { + int error = database->seq(database, &key, &data, R_FIRST); + while ( !error ) { user_type *user = data.data; printf("%.*s -> %s (%d)\n", (int) key.size, (char *) key.data, user->fullname, user->age); - err = database->seq(database, &key, &data, R_NEXT); + error = database->seq(database, &key, &data, R_NEXT); } } int main(void) { - DB *database = dbopen("./database.db", O_RDWR | O_CREAT, MODE, DB_BTREE, NULL); + DB *database = dbopen(DATABASE_NAME, O_RDWR | O_CREAT, MODE, DB_BTREE, NULL); if ( database == NULL ) { (void) fprintf(stderr, "Datenbank konnte nicht geöffnet werden\n"); return EXIT_FAILURE; @@ -118,7 +120,7 @@ main(void) lookup(database, "user1"); - delete(database, "user1"); + erase(database, "user1"); update(database, "datengott", 50); -- cgit v1.3