- doxygen tags fixed

- variable names aligned for better readability
- gcc warning fixed

db/db.h

@@ -31,9 +31,7 @@
 
 /**
  * \defgroup DB_API Database Abstraction Layer
- * \brief brief description
  *
- * I wonder where this text goes.
  * @{
  */
 

db/db_cmd.c

@@ -26,7 +26,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/** \ingroup DB_API @{ */
+/** \ingroup DB_API 
+ * @{ 
+ */
 
 #include <string.h>
 #include "../dprint.h"
@@ -39,25 +41,24 @@ db_cmd_t* db_cmd(enum db_cmd_type type, db_ctx_t* ctx, char* table,
 				 db_fld_t* result, db_fld_t* params)
 {
 	char* fname;
-    db_cmd_t* res;
+    db_cmd_t* newp;
 	db_con_t* con;
-	db_fld_t* f;
 	int i, r, j;
+	
+    newp = (db_cmd_t*)pkg_malloc(sizeof(db_cmd_t));
+    if (newp == NULL) goto err;
+    memset(newp, '\0', sizeof(db_cmd_t));
+	if (db_gen_init(&newp->gen) < 0) goto err;
+    newp->ctx = ctx;
 
-    res = (db_cmd_t*)pkg_malloc(sizeof(db_cmd_t));
-    if (res == NULL) goto err;
-    memset(res, '\0', sizeof(db_cmd_t));
-	if (db_gen_init(&res->gen) < 0) goto err;
-    res->ctx = ctx;
-
-	res->table.len = strlen(table);
-    res->table.s = (char*)pkg_malloc(res->table.len);
-    if (res->table.s == NULL) goto err;
-    memcpy(res->table.s, table, res->table.len);
+	newp->table.len = strlen(table);
+    newp->table.s = (char*)pkg_malloc(newp->table.len);
+    if (newp->table.s == NULL) goto err;
+    memcpy(newp->table.s, table, newp->table.len);
 
-	res->type = type;
-	res->result = result;
-	res->params = params;
+	newp->type = type;
+	newp->result = result;
+	newp->params = params;
 
 	for(i = 0; i < ctx->con_n; i++) {
 		con = ctx->con[i];
@@ -76,14 +77,14 @@ db_cmd_t* db_cmd(enum db_cmd_type type, db_ctx_t* ctx, char* table,
 			}
 		}
 
-		r = db_drv_call(&con->uri->scheme, "db_cmd", res, i);
+		r = db_drv_call(&con->uri->scheme, "db_cmd", newp, i);
 		if (r < 0) goto err;
 		if (r > 0) {
 			ERR("DB driver %.*s does not implement mandatory db_cmd function\n",
 				con->uri->scheme.len, ZSW(con->uri->scheme.s));
 			goto err;
 		}
-		if (res->exec[i] == NULL) {
+		if (newp->exec[i] == NULL) {
 			/* db_cmd in the db driver did not provide any runtime function, so try to lookup the
 			 * default one through the module API
 			 */
@@ -94,7 +95,7 @@ db_cmd_t* db_cmd(enum db_cmd_type type, db_ctx_t* ctx, char* table,
 			default: ERR("db_cmd: Unsupported command type\n"); goto err;
 			}
 
-			r = db_drv_func((void*)&(res->exec[i]), &con->uri->scheme, fname);
+			r = db_drv_func((void*)&(newp->exec[i]), &con->uri->scheme, fname);
 			if (r < 0) goto err;
 			if (r > 0) {
 				ERR("DB driver %.*s does not provide runtime execution function %s\n",
@@ -103,7 +104,7 @@ db_cmd_t* db_cmd(enum db_cmd_type type, db_ctx_t* ctx, char* table,
 			}
 		}
 
-		r = db_drv_func((void*)(&res->first[i]), &con->uri->scheme, "db_first");
+		r = db_drv_func((void*)(&newp->first[i]), &con->uri->scheme, "db_first");
 		if (r < 0) goto err;
 		if (r > 0) {
 			ERR("DB driver %.*s does not implement mandatory db_first function\n",
@@ -111,7 +112,7 @@ db_cmd_t* db_cmd(enum db_cmd_type type, db_ctx_t* ctx, char* table,
 			goto err;
 		}
 
-		r = db_drv_func((void*)(&res->next[i]), &con->uri->scheme, "db_next");
+		r = db_drv_func((void*)(&newp->next[i]), &con->uri->scheme, "db_next");
 		if (r < 0) goto err;
 		if (r > 0) {
 			ERR("DB driver %.*s does not implement mandatory db_next function\n",
@@ -121,14 +122,14 @@ db_cmd_t* db_cmd(enum db_cmd_type type, db_ctx_t* ctx, char* table,
 
 
 	}
-    return res;
+    return newp;
 
  err:
     ERR("db_cmd: Cannot create db_cmd structure\n");
-    if (res) {
-		db_gen_free(&res->gen);
-		if (res->table.s) pkg_free(res->table.s);
-		pkg_free(res);
+    if (newp) {
+		db_gen_free(&newp->gen);
+		if (newp->table.s) pkg_free(newp->table.s);
+		pkg_free(newp);
 	}
 	return NULL;
 }
@@ -160,7 +161,6 @@ void db_cmd_free(db_cmd_t* cmd)
 
 int db_exec(db_res_t** res, db_cmd_t* cmd)
 {
-	int i;
 	db_res_t* r = NULL;
 
 	if (cmd->type == DB_GET) {

db/db_cmd.h

@@ -54,7 +54,7 @@ struct db_rec;
 
 typedef int (*db_exec_func_t)(struct db_res* res, struct db_cmd* cmd);
 typedef int (*db_first_func_t)(struct db_res* res);
-typedef int (*db_next_func_t)(struct db_rec* rec);
+typedef int (*db_next_func_t)(struct db_res* res);
 
 
 enum db_cmd_type {

db/db_con.c

@@ -26,7 +26,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/** \ingroup DB_API @{ */
+/** \ingroup DB_API 
+ * @{ 
+ */
 
 #include <string.h>
 #include <stdlib.h>
@@ -64,33 +66,33 @@ static void db_con_disconnect(db_con_t* con)
  */
 db_con_t* db_con(db_ctx_t* ctx, db_uri_t* uri)
 {
-    db_con_t* r;
+    db_con_t* newp;
 
-    r = (db_con_t*)pkg_malloc(sizeof(db_con_t));
-    if (r == NULL) {
+    newp = (db_con_t*)pkg_malloc(sizeof(db_con_t));
+    if (newp == NULL) {
 		ERR("db_con: No memory left\n");
 		goto error;
     }
 
-    memset(r, '\0', sizeof(db_con_t));
-	if (db_gen_init(&r->gen) < 0) goto error;
+    memset(newp, '\0', sizeof(db_con_t));
+	if (db_gen_init(&newp->gen) < 0) goto error;
 
-    r->uri = uri;
-	r->ctx = ctx;
-	r->connect = db_con_connect;
-	r->disconnect = db_con_disconnect;
+    newp->uri = uri;
+	newp->ctx = ctx;
+	newp->connect = db_con_connect;
+	newp->disconnect = db_con_disconnect;
 
 	/* Call db_ctx function if the driver has it */
-	if (db_drv_call(&uri->scheme, "db_con", r, ctx->con_n) < 0) {
+	if (db_drv_call(&uri->scheme, "db_con", newp, ctx->con_n) < 0) {
 		goto error;
 	}
 
-	return r;
+	return newp;
 
  error:
-	if (r) {
-		db_gen_free(&r->gen);
-		pkg_free(r);
+	if (newp) {
+		db_gen_free(&newp->gen);
+		pkg_free(newp);
 	}
 	return NULL;
 }

db/db_con.h

@@ -29,7 +29,9 @@
 #ifndef _DB_CON_H
 #define _DB_CON_H  1
 
-/** \ingroup DB_API @{ */
+/** \ingroup DB_API 
+ * @{ 
+ */
 
 #include "db_gen.h"
 #include "db_ctx.h"

db/db_ctx.c

@@ -26,7 +26,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/** \ingroup DB_API @{ */
+/** \ingroup DB_API 
+ * @{ 
+ */
 
 #include <string.h>
 #include "../dprint.h"
@@ -48,7 +50,7 @@ static struct db_ctx_data* db_ctx_data(str* module, db_drv_t* data)
 	memcpy(newp->module.s, module->s, module->len);
 	newp->module.len = module->len;
 	newp->data = data;
-	return res;
+	return newp;
 
  error:
 	ERR("No memory left\n");
@@ -70,29 +72,29 @@ static void db_ctx_data_free(struct db_ctx_data* ptr)
  */
 db_ctx_t* db_ctx(const char* id)
 {
-    db_ctx_t* r;
+    db_ctx_t* newp;
 
-    r = (db_ctx_t*)pkg_malloc(sizeof(db_ctx_t));
-    if (r == NULL) goto error;
-    memset(r, '\0', sizeof(db_ctx_t));
-	if (db_gen_init(&r->gen) < 0) goto error;
+    newp = (db_ctx_t*)pkg_malloc(sizeof(db_ctx_t));
+    if (newp == NULL) goto error;
+    memset(newp, '\0', sizeof(db_ctx_t));
+	if (db_gen_init(&newp->gen) < 0) goto error;
 
-	r->id.len = strlen(id);
-	r->id.s = pkg_malloc(r->id.len + 1);
-	if (r->id.s == NULL) goto error;
-	memcpy(r->id.s, id, r->id.len + 1);
+	newp->id.len = strlen(id);
+	newp->id.s = pkg_malloc(newp->id.len + 1);
+	if (newp->id.s == NULL) goto error;
+	memcpy(newp->id.s, id, newp->id.len + 1);
 
 	/* Insert the newly created context into the linked list
 	 * of all existing contexts
 	 */
-	DBLIST_INSERT_HEAD(&db, r);
-    return r;
+	DBLIST_INSERT_HEAD(&db, newp);
+    return newp;
 
  error:
-	if (r) {
-		db_gen_free(&r->gen);
-		if (r->id.s) pkg_free(r->id.s);
-		pkg_free(r);
+	if (newp) {
+		db_gen_free(&newp->gen);
+		if (newp->id.s) pkg_free(newp->id.s);
+		pkg_free(newp);
 	}
 	return NULL;
 }

db/db_ctx.h

@@ -29,7 +29,9 @@
 #ifndef _DB_CTX_H
 #define _DB_CTX_H  1
 
-/** \ingroup DB_API @{ */
+/** \ingroup DB_API 
+ * @{ 
+ */
 
 #include "../str.h"
 #include "../list.h"

db/db_drv.c

@@ -26,7 +26,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/** \ingroup DB_API @{ */
+/** \ingroup DB_API 
+ * @{ 
+ */
 
 #include <string.h>
 #include <stdlib.h>

db/db_drv.h

@@ -29,7 +29,9 @@
 #ifndef _DB_DRV_H
 #define _DB_DRV_H  1
 
-/** \ingroup DB_API @{ */
+/** \ingroup DB_API 
+ * @{ 
+ */
 
 #include "../str.h"
 #include "../list.h"

db/db_fld.c

@@ -26,7 +26,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/** \ingroup DB_API @{ */
+/** \ingroup DB_API 
+ * @{ 
+ */
 
 #include <string.h>
 #include "../mem/mem.h"
@@ -57,22 +59,22 @@ void db_fld_close(db_fld_t* fld, size_t n)
 
 db_fld_t* db_fld(size_t n)
 {
-	db_fld_t* r;
+	db_fld_t* newp;
 
-	r = (db_fld_t*)pkg_malloc(sizeof(db_fld_t) * n);
-	if (r == NULL) {
+	newp = (db_fld_t*)pkg_malloc(sizeof(db_fld_t) * n);
+	if (newp == NULL) {
 		ERR("db_fld: No memory left\n");
 		return NULL;
 	}
-	memset(r, '\0', sizeof(db_fld_t) * n);
+	memset(newp, '\0', sizeof(db_fld_t) * n);
 
-	if (db_fld_init(r, n) < 0) goto error;
-	return r;
+	if (db_fld_init(newp, n) < 0) goto error;
+	return newp;
 
  error:
-	if (r) {
-		db_gen_free(&r->gen);
-		pkg_free(r);
+	if (newp) {
+		db_gen_free(&newp->gen);
+		pkg_free(newp);
 	}
 	return NULL;
 }

db/db_fld.h

@@ -29,7 +29,9 @@
 #ifndef _DB_FLD_H
 #define _DB_FLD_H  1
 
-/** \ingroup DB_API @{ */
+/** \ingroup DB_API 
+ * @{ 
+ */
 
 #include <time.h>
 #include "../str.h"
@@ -90,7 +92,7 @@ struct db_fld* db_fld(size_t n);
 void db_fld_free(struct db_fld* fld, size_t n);
 
 int db_fld_init(struct db_fld* fld, size_t n);
-void db_fld_release(struct db_fld* fld, size_t n);
+void db_fld_close(struct db_fld* fld, size_t n);
 
 
 #ifdef __cplusplus

db/db_gen.c

@@ -26,7 +26,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/** \ingroup DB_API @{ */
+/** \ingroup DB_API 
+ * @{ 
+ */
 
 #include <string.h>
 #include "db_gen.h"

db/db_pool.c

@@ -26,7 +26,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/** \ingroup DB_API @{ */
+/** \ingroup DB_API 
+ * @{ 
+ */
 
 #include <unistd.h>
 #include <string.h>
@@ -97,8 +99,6 @@ void db_pool_put(db_pool_entry_t* entry)
  */
 int db_pool_remove(db_pool_entry_t* entry)
 {
-	db_pool_entry_t* ptr, *tmp_ptr;
-
 	if (!entry) return -2;
 
 	if (entry->ref > 1) {

db/db_rec.c

@@ -26,7 +26,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/** \ingroup DB_API @{ */
+/** \ingroup DB_API 
+ * @{ 
+ */
 
 #include <stdlib.h>
 #include <string.h>
@@ -37,21 +39,21 @@
 
 db_rec_t* db_rec(db_res_t* res, db_fld_t* fld)
 {
-    db_rec_t* r;
+    db_rec_t* newp;
 
-    r = (db_rec_t*)pkg_malloc(sizeof(db_rec_t));
-    if (r == NULL) goto err;
-    memset(r, '\0', sizeof(db_rec_t));
-	if (db_gen_init(&r->gen) < 0) goto err;
-	r->res = res;
-	r->fld = fld;
-    return r;
+    newp = (db_rec_t*)pkg_malloc(sizeof(db_rec_t));
+    if (newp == NULL) goto err;
+    memset(newp, '\0', sizeof(db_rec_t));
+	if (db_gen_init(&newp->gen) < 0) goto err;
+	newp->res = res;
+	newp->fld = fld;
+    return newp;
 
  err:
     ERR("Cannot create db_rec structure\n");
-	if (r) {
-		db_gen_free(&r->gen);
-		pkg_free(r);
+	if (newp) {
+		db_gen_free(&newp->gen);
+		pkg_free(newp);
 	}
     return NULL;
 }

db/db_rec.h

@@ -29,7 +29,9 @@
 #ifndef _DB_REC_H
 #define _DB_REC_H  1
 
-/** \ingroup DB_API @{ */
+/** \ingroup DB_API 
+ * @{ 
+ */
 
 #include "db_gen.h"
 #include "db_res.h"

db/db_res.c

@@ -26,7 +26,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/** \ingroup DB_API @{ */
+/** \ingroup DB_API 
+ * @{ 
+ */
 
 #include <string.h>
 #include "../dprint.h"
@@ -36,29 +38,29 @@
 
 db_res_t* db_res(db_cmd_t* cmd)
 {
-    db_res_t* r;
+    db_res_t* newp;
 	int ret;
 
-    r = (db_res_t*)pkg_malloc(sizeof(db_res_t));
-    if (r == NULL) goto err;
-	memset(r, '\0', sizeof(db_res_t));
-	if (db_gen_init(&r->gen) < 0) goto err;
-    r->cmd = cmd;
+    newp = (db_res_t*)pkg_malloc(sizeof(db_res_t));
+    if (newp == NULL) goto err;
+	memset(newp, '\0', sizeof(db_res_t));
+	if (db_gen_init(&newp->gen) < 0) goto err;
+    newp->cmd = cmd;
 
 	ret = db_drv_call(&cmd->ctx->con[db_payload_idx]->uri->scheme, 
-					  "db_res", r, db_payload_idx);
+					  "db_res", newp, db_payload_idx);
 	if (ret < 0) goto err;
 
-	r->cur_rec = db_rec(r, cmd->result);
-	if (r->cur_rec == NULL) goto err;
-    return r;
+	newp->cur_rec = db_rec(newp, cmd->result);
+	if (newp->cur_rec == NULL) goto err;
+    return newp;
 
  err:
     ERR("db_res: Cannot create db_res structure\n");
-	if (r) {
-		if (r->cur_rec) db_rec_free(r->cur_rec);
-		db_gen_free(&r->gen);
-		pkg_free(r);
+	if (newp) {
+		if (newp->cur_rec) db_rec_free(newp->cur_rec);
+		db_gen_free(&newp->gen);
+		pkg_free(newp);
 	}
     return NULL;
 }

db/db_uri.c

@@ -26,7 +26,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/** \ingroup DB_API @{ */
+/** \ingroup DB_API 
+ * @{ 
+ */
 
 #include <string.h>
 #include "../dprint.h"
@@ -68,45 +70,45 @@ db_uri_t* db_uri(const char* uri)
 {
     char* colon;
     int len;
-    db_uri_t* r;
+    db_uri_t* newp;
     
-    r = (db_uri_t*)pkg_malloc(sizeof(db_uri_t));
-    if (r == NULL) goto error;
-    memset(r, '\0', sizeof(db_uri_t));
-	if (db_gen_init(&r->gen) < 0) goto error;	
+    newp = (db_uri_t*)pkg_malloc(sizeof(db_uri_t));
+    if (newp == NULL) goto error;
+    memset(newp, '\0', sizeof(db_uri_t));
+	if (db_gen_init(&newp->gen) < 0) goto error;	
 
     len = strlen(uri);
     colon = q_memchr((char*)uri, ':', len);
     if (colon == NULL) {
-		r->scheme.s = pkg_malloc(len + 1);
-		if (r->scheme.s == NULL) goto error;
-		memcpy(r->scheme.s, uri, len);
-		r->scheme.len = len;
+		newp->scheme.s = pkg_malloc(len + 1);
+		if (newp->scheme.s == NULL) goto error;
+		memcpy(newp->scheme.s, uri, len);
+		newp->scheme.len = len;
     } else {
-		r->scheme.len = colon - uri;
-		r->scheme.s = pkg_malloc(r->scheme.len + 1);
-		if (r->scheme.s == NULL) goto error;
-		memcpy(r->scheme.s, uri, colon - uri);
+		newp->scheme.len = colon - uri;
+		newp->scheme.s = pkg_malloc(newp->scheme.len + 1);
+		if (newp->scheme.s == NULL) goto error;
+		memcpy(newp->scheme.s, uri, colon - uri);
 		
-		r->body.len = len - r->scheme.len - 1;
-		r->body.s = pkg_malloc(r->body.len + 1);
-		if (r->body.s == NULL) goto error;
-		memcpy(r->body.s, colon + 1, r->body.len);
-		r->body.s[r->body.len] = '\0';
+		newp->body.len = len - newp->scheme.len - 1;
+		newp->body.s = pkg_malloc(newp->body.len + 1);
+		if (newp->body.s == NULL) goto error;
+		memcpy(newp->body.s, colon + 1, newp->body.len);
+		newp->body.s[newp->body.len] = '\0';
     }
-    r->scheme.s[r->scheme.len] = '\0';
+    newp->scheme.s[newp->scheme.len] = '\0';
 
 	/* Call db_uri function if the driver has it */
-	if (db_drv_call(&r->scheme, "db_uri", r, 0) < 0) goto error;
-    return r;
+	if (db_drv_call(&newp->scheme, "db_uri", newp, 0) < 0) goto error;
+    return newp;
     
  error:
     ERR("db_uri: Error while creating db_uri structure\n");
-	if (r) {
-		db_gen_free(&r->gen);
-		if (r->body.s) pkg_free(r->body.s);
-		if (r->scheme.s) pkg_free(r->scheme.s);
-		pkg_free(r);
+	if (newp) {
+		db_gen_free(&newp->gen);
+		if (newp->body.s) pkg_free(newp->body.s);
+		if (newp->scheme.s) pkg_free(newp->scheme.s);
+		pkg_free(newp);
 	}
     return 0;
 }

db/db_uri.h

@@ -29,7 +29,9 @@
 #ifndef _DB_URI_H
 #define _DB_URI_H  1
 
-/** \ingroup DB_API @{ */
+/** \ingroup DB_API 
+ * @{ 
+ */
 
 #include "../str.h"
 #include "db_gen.h"