From 33a1feb5165b338013459fd2e5536560f1499c55 Mon Sep 17 00:00:00 2001 From: losinshi Date: Tue, 15 Aug 2006 08:55:04 +0000 Subject: [PATCH] make code more readeable git-svn-id: file:///home/jan/tmp/wetterstation/trunk@18 dd492736-c11a-0410-ad51-8c26713eaf7f --- deamon/seriell/input.c | 2 +- deamon/seriell/write.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/deamon/seriell/input.c b/deamon/seriell/input.c index f1ce03b..c2d1bfc 100644 --- a/deamon/seriell/input.c +++ b/deamon/seriell/input.c @@ -100,7 +100,7 @@ int read_port(){ temp = buffer; /* Temporärer Zeiger bekommt die Anfangsaddresse vom Puffer */ - add_clean(clean_port, &fd); + add_clean(clean_port, &fd); /* Callbackfunktion zum Aufräumen registrieren */ DEBUGOUT1("\nWarte auf Daten\n\n"); diff --git a/deamon/seriell/write.c b/deamon/seriell/write.c index fd4d306..faac499 100644 --- a/deamon/seriell/write.c +++ b/deamon/seriell/write.c @@ -119,10 +119,10 @@ static int pg_connect(){ conn_string = malloc(sizeof(char)*255); snprintf(conn_string, 255, "host=%s dbname=%s user=%s password=%s", global_opts.pg_host, global_opts.pg_database, global_opts.pg_user, global_opts.pg_pass); } - connection = PQconnectdb(conn_string); - add_clean(clean_write, connection); + connection = PQconnectdb(conn_string); /* Connection aufbauen */ + add_clean(clean_write, connection); /* Callbackfunktion zum Aufräumen registrieren */ } else { - PQreset(connection); + PQreset(connection); /* Connecion resetten */ } if(PQstatus(connection) != CONNECTION_OK){ DEBUGOUT2("\nFehler beim Aufbau der Datenbankverbindung\n%s\n", PQerrorMessage(connection)); @@ -137,6 +137,7 @@ static int pg_connect(){ return 1; } +/* Ein Datum in die Datenbank schreiben */ static void pg_insert(char *query){ PGresult *res; if(pg_connect()){ @@ -154,6 +155,8 @@ static void pg_insert(char *query){ } } +/* Callbackfunktion zum Aufräume. + * Schliesst die Verbindung zur Datenbank */ static void clean_write(void *data){ PGconn *conn = data; PQfinish(conn);