Browse Source

add 'db_' prefix to fetch_rows and fetch_row function to prevent name clash
with mysql library function


git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2196 689a6050-402a-0410-94f2-e92a70836424

Henning Westerholt 18 years ago
parent
commit
c52783fd16
4 changed files with 10 additions and 10 deletions
  1. 6 6
      lib/srdb1/db_res.c
  2. 1 1
      lib/srdb1/db_res.h
  3. 2 2
      lib/srdb1/db_row.c
  4. 1 1
      lib/srdb1/db_row.h

+ 6 - 6
lib/srdb1/db_res.c

@@ -30,22 +30,22 @@
 /*
  * Release memory used by rows
  */
-inline int free_rows(db_res_t* _r)
+inline int db_free_rows(db_res_t* _r)
 {
 	int i;
 
 	if (!_r) {
-		LOG(L_ERR, "ERROR:free_rows: Invalid parameter value\n");
+		LOG(L_ERR, "ERROR:db_free_rows: Invalid parameter value\n");
 		return -1;
 	}
-	LOG(L_DBG, "DEBUG:free_rows: Freeing %d rows\n", RES_ROW_N(_r));
+	LOG(L_DBG, "DEBUG:db_free_rows: Freeing %d rows\n", RES_ROW_N(_r));
 
 	for(i = 0; i < RES_ROW_N(_r); i++) {
-		LOG(L_DBG, "DEBUG:free_row: Row[%d]=%p\n", i, &(RES_ROWS(_r)[i]));
-		free_row(&(RES_ROWS(_r)[i]));
+		LOG(L_DBG, "DEBUG:db_free_row: Row[%d]=%p\n", i, &(RES_ROWS(_r)[i]));
+		db_free_row(&(RES_ROWS(_r)[i]));
 	}
 	if (RES_ROWS(_r)) {
-		LOG(L_DBG, "DEBUG:free_rows: %p=pkg_free() RES_ROWS\n", RES_ROWS(_r));
+		LOG(L_DBG, "DEBUG:db_free_rows: %p=pkg_free() RES_ROWS\n", RES_ROWS(_r));
 		pkg_free(RES_ROWS(_r));
 		RES_ROWS(_r) = NULL;
 	}

+ 1 - 1
lib/srdb1/db_res.h

@@ -54,6 +54,6 @@ typedef struct db_res {
 /*
  * Release memory used by rows in a result structure
  */
-int free_rows(db_res_t* _r);
+int db_free_rows(db_res_t* _r);
 
 #endif /* DB_RES_H */

+ 2 - 2
lib/srdb1/db_row.c

@@ -29,10 +29,10 @@
 /*
  * Release memory used by row
  */
-inline int free_row(db_row_t* _r)
+inline int db_free_row(db_row_t* _r)
 {
 	if (!_r) {
-		LOG(L_ERR, "ERROR:free_row: Invalid parameter value\n");
+		LOG(L_ERR, "ERROR:db_free_row: Invalid parameter value\n");
 		return -1;
 	}
 

+ 1 - 1
lib/srdb1/db_row.h

@@ -42,6 +42,6 @@ typedef struct db_row {
 /*
  * Release memory used by row
  */
-int free_row(db_row_t* _r);
+int db_free_row(db_row_t* _r);
 
 #endif /* DB_ROW_H */