Improve function wording - renamed osync_db_reset to osync_db_reset_table,
since a table gets rested, not an entire database!
---
opensync/db/opensync_db.c | 4 ++--
opensync/db/opensync_db.h | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
Index: opensync/opensync/db/opensync_db.c
===================================================================
--- opensync.orig/opensync/db/opensync_db.c
+++ opensync/opensync/db/opensync_db.c
@@ -334,7 +334,7 @@ error:
* @param error Pointer to a error struct
* @return TRUE on success otherwise FALSE
*/
-osync_bool osync_db_reset(OSyncDB *db, const char *tablename, OSyncError **error)
+osync_bool osync_db_reset_table(OSyncDB *db, const char *tablename, OSyncError **error)
{
osync_trace(TRACE_ENTRY, "%s(%p, %s, %p)", __func__, db, tablename, error);
@@ -372,7 +372,7 @@ osync_bool osync_db_reset_full(OSyncDB *
while (sqlite3_step(ppStmt) == SQLITE_ROW) {
const char *table = (const char *) sqlite3_column_text(ppStmt, 0);
- if (!osync_db_reset(db, table, error))
+ if (!osync_db_reset_table(db, table, error))
goto error;
}
@@ -417,7 +417,7 @@ error:
* @param error Pointer to a error struct
* @return If the table exist 1 else 0. On error -1.
*/
-int osync_db_exists(OSyncDB *db, const char *tablename, OSyncError **error)
+int osync_db_table_exists(OSyncDB *db, const char *tablename, OSyncError **error)
{
osync_trace(TRACE_ENTRY, "%s(%p, %s, %p)", __func__, db, tablename, error);
Index: opensync/opensync/db/opensync_db.h
===================================================================
--- opensync.orig/opensync/db/opensync_db.h
+++ opensync/opensync/db/opensync_db.h
@@ -27,9 +27,9 @@ OSYNC_EXPORT OSyncDB *osync_db_new(OSync
OSYNC_EXPORT osync_bool osync_db_open(OSyncDB *db, const char *dbfile, OSyncError **error);
OSYNC_EXPORT osync_bool osync_db_close(OSyncDB *db, OSyncError **error);
-OSYNC_EXPORT int osync_db_exists(OSyncDB *db, const char *tablename, OSyncError **error);
+OSYNC_EXPORT int osync_db_table_exists(OSyncDB *db, const char *tablename, OSyncError **error);
-OSYNC_EXPORT osync_bool osync_db_reset(OSyncDB *db, const char *tablename, OSyncError **error);
+OSYNC_EXPORT osync_bool osync_db_reset_table(OSyncDB *db, const char *tablename, OSyncError **error);
OSYNC_EXPORT osync_bool osync_db_reset_full(OSyncDB *db, OSyncError **error);
OSYNC_EXPORT int osync_db_count(OSyncDB *db, const char *query, OSyncError **error);
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone_______________________________________________
Opensync-devel mailing list
Opensync-devel@...
https://lists.sourceforge.net/lists/listinfo/opensync-devel