[GRASS-SVN] r66884 - in grass/branches/releasebranch_7_0: db/drivers db/drivers/dbf db/drivers/mysql db/drivers/odbc db/drivers/ogr db/drivers/postgres db/drivers/sqlite lib/db/dbmi_base lib/db/dbmi_driver lib/db/stubs
svn_grass at osgeo.org
svn_grass at osgeo.org
Sat Nov 21 09:59:43 PST 2015
Author: martinl
Date: 2015-11-21 09:59:42 -0800 (Sat, 21 Nov 2015)
New Revision: 66884
Added:
grass/branches/releasebranch_7_0/lib/db/dbmi_base/dbstubs.h
Removed:
grass/branches/releasebranch_7_0/db/drivers/mk_dbdriver_h.sh
grass/branches/releasebranch_7_0/lib/db/dbmi_driver/dbstubs.h
grass/branches/releasebranch_7_0/lib/db/dbmi_driver/mk_dbstubs_h.sh
Modified:
grass/branches/releasebranch_7_0/db/drivers/dbf/dbdriver.h
grass/branches/releasebranch_7_0/db/drivers/mysql/dbdriver.h
grass/branches/releasebranch_7_0/db/drivers/odbc/dbdriver.h
grass/branches/releasebranch_7_0/db/drivers/ogr/dbdriver.h
grass/branches/releasebranch_7_0/db/drivers/postgres/dbdriver.h
grass/branches/releasebranch_7_0/db/drivers/sqlite/dbdriver.h
grass/branches/releasebranch_7_0/lib/db/dbmi_base/Makefile
grass/branches/releasebranch_7_0/lib/db/dbmi_driver/Makefile
grass/branches/releasebranch_7_0/lib/db/stubs/add_col.c
grass/branches/releasebranch_7_0/lib/db/stubs/bindupdate.c
grass/branches/releasebranch_7_0/lib/db/stubs/close_cursor.c
grass/branches/releasebranch_7_0/lib/db/stubs/closedb.c
grass/branches/releasebranch_7_0/lib/db/stubs/create_index.c
grass/branches/releasebranch_7_0/lib/db/stubs/create_table.c
grass/branches/releasebranch_7_0/lib/db/stubs/createdb.c
grass/branches/releasebranch_7_0/lib/db/stubs/delete.c
grass/branches/releasebranch_7_0/lib/db/stubs/deletedb.c
grass/branches/releasebranch_7_0/lib/db/stubs/desc_table.c
grass/branches/releasebranch_7_0/lib/db/stubs/drop_col.c
grass/branches/releasebranch_7_0/lib/db/stubs/drop_index.c
grass/branches/releasebranch_7_0/lib/db/stubs/drop_table.c
grass/branches/releasebranch_7_0/lib/db/stubs/execute.c
grass/branches/releasebranch_7_0/lib/db/stubs/fetch.c
grass/branches/releasebranch_7_0/lib/db/stubs/finddb.c
grass/branches/releasebranch_7_0/lib/db/stubs/finish.c
grass/branches/releasebranch_7_0/lib/db/stubs/init.c
grass/branches/releasebranch_7_0/lib/db/stubs/insert.c
grass/branches/releasebranch_7_0/lib/db/stubs/list_index.c
grass/branches/releasebranch_7_0/lib/db/stubs/list_tables.c
grass/branches/releasebranch_7_0/lib/db/stubs/listdb.c
grass/branches/releasebranch_7_0/lib/db/stubs/open_insert.c
grass/branches/releasebranch_7_0/lib/db/stubs/open_select.c
grass/branches/releasebranch_7_0/lib/db/stubs/open_update.c
grass/branches/releasebranch_7_0/lib/db/stubs/opendb.c
grass/branches/releasebranch_7_0/lib/db/stubs/priv.c
grass/branches/releasebranch_7_0/lib/db/stubs/rows.c
grass/branches/releasebranch_7_0/lib/db/stubs/transaction.c
grass/branches/releasebranch_7_0/lib/db/stubs/update.c
Log:
Add parameter types to declarations
Include dbstubs.h, fix prototypes for open_select_cursor and describe_table
Move dbstubs.h to fix build failures from r66773
(merge r66772, r66773, r66817)
Modified: grass/branches/releasebranch_7_0/db/drivers/dbf/dbdriver.h
===================================================================
--- grass/branches/releasebranch_7_0/db/drivers/dbf/dbdriver.h 2015-11-21 17:40:54 UTC (rev 66883)
+++ grass/branches/releasebranch_7_0/db/drivers/dbf/dbdriver.h 2015-11-21 17:59:42 UTC (rev 66884)
@@ -1,22 +1,8 @@
-/* this file was automatically generated by ../mk_dbdriver_h.sh */
#ifndef DBDRIVER_H
#define DBDRIVER_H
#include <grass/dbstubs.h>
-int db__driver_create_table();
-int db__driver_close_cursor();
-int db__driver_open_database();
-int db__driver_close_database();
-int db__driver_describe_table();
-int db__driver_init();
-int db__driver_finish();
-int db__driver_execute_immediate();
-int db__driver_fetch();
-int db__driver_get_num_rows();
-int db__driver_list_tables();
-int db__driver_open_select_cursor();
-
#define init_dbdriver() do{\
db_driver_create_table = db__driver_create_table;\
db_driver_close_cursor = db__driver_close_cursor;\
Deleted: grass/branches/releasebranch_7_0/db/drivers/mk_dbdriver_h.sh
===================================================================
--- grass/branches/releasebranch_7_0/db/drivers/mk_dbdriver_h.sh 2015-11-21 17:40:54 UTC (rev 66883)
+++ grass/branches/releasebranch_7_0/db/drivers/mk_dbdriver_h.sh 2015-11-21 17:59:42 UTC (rev 66884)
@@ -1,31 +0,0 @@
-#!/bin/sh
-# generates dbdriver.h
-
-tmp=mk_dbdriver_h.tmp.$$
-cat <<'EOT'> dbdriver.h
-/* this file was automatically generated by ../mk_dbdriver_h.sh */
-#ifndef DBDRIVER_H
-#define DBDRIVER_H
-
-#include <grass/dbstubs.h>
-
-EOT
-
-grep -h '^\( *int *\)\?db__driver' *.c | sed \
- -e 's/^\( *int *\)*/int /' \
- -e 's/ *(.*$/();/' > $tmp
-cat $tmp >> dbdriver.h
-
-cat <<'EOT' >> dbdriver.h
-
-#define init_dbdriver() do{\
-EOT
-
-sed 's/^int *db__\([a-zA-Z_]*\).*$/db_\1 = db__\1;\\/' $tmp >> dbdriver.h
-cat <<'EOT'>> dbdriver.h
-}while(0)
-
-#endif
-EOT
-
-rm $tmp
Modified: grass/branches/releasebranch_7_0/db/drivers/mysql/dbdriver.h
===================================================================
--- grass/branches/releasebranch_7_0/db/drivers/mysql/dbdriver.h 2015-11-21 17:40:54 UTC (rev 66883)
+++ grass/branches/releasebranch_7_0/db/drivers/mysql/dbdriver.h 2015-11-21 17:59:42 UTC (rev 66884)
@@ -1,25 +1,8 @@
-/* this file was automatically generated by ../mk_dbdriver_h.sh */
#ifndef DBDRIVER_H
#define DBDRIVER_H
#include <grass/dbstubs.h>
-int db__driver_create_table();
-int db__driver_close_cursor();
-int db__driver_open_database();
-int db__driver_close_database();
-int db__driver_describe_table();
-int db__driver_init();
-int db__driver_finish();
-int db__driver_execute_immediate();
-int db__driver_begin_transaction();
-int db__driver_commit_transaction();
-int db__driver_fetch();
-int db__driver_get_num_rows();
-int db__driver_create_index();
-int db__driver_list_tables();
-int db__driver_open_select_cursor();
-
#define init_dbdriver() do{\
db_driver_create_table = db__driver_create_table;\
db_driver_close_cursor = db__driver_close_cursor;\
Modified: grass/branches/releasebranch_7_0/db/drivers/odbc/dbdriver.h
===================================================================
--- grass/branches/releasebranch_7_0/db/drivers/odbc/dbdriver.h 2015-11-21 17:40:54 UTC (rev 66883)
+++ grass/branches/releasebranch_7_0/db/drivers/odbc/dbdriver.h 2015-11-21 17:59:42 UTC (rev 66884)
@@ -1,24 +1,8 @@
-/* this file was automatically generated by ../mk_dbdriver_h.sh */
#ifndef DBDRIVER_H
#define DBDRIVER_H
#include <grass/dbstubs.h>
-int db__driver_create_table();
-int db__driver_close_cursor();
-int db__driver_open_database();
-int db__driver_close_database();
-int db__driver_describe_table();
-int db__driver_init();
-int db__driver_finish();
-int db__driver_execute_immediate();
-int db__driver_fetch();
-int db__driver_get_num_rows();
-int db__driver_list_databases();
-int db__driver_list_tables();
-int db__driver_open_select_cursor();
-int db__driver_drop_table();
-
#define init_dbdriver() do{\
db_driver_create_table = db__driver_create_table;\
db_driver_close_cursor = db__driver_close_cursor;\
Modified: grass/branches/releasebranch_7_0/db/drivers/ogr/dbdriver.h
===================================================================
--- grass/branches/releasebranch_7_0/db/drivers/ogr/dbdriver.h 2015-11-21 17:40:54 UTC (rev 66883)
+++ grass/branches/releasebranch_7_0/db/drivers/ogr/dbdriver.h 2015-11-21 17:59:42 UTC (rev 66884)
@@ -1,21 +1,8 @@
-/* this file was automatically generated by ../mk_dbdriver_h.sh */
#ifndef DBDRIVER_H
#define DBDRIVER_H
#include <grass/dbstubs.h>
-int db__driver_close_cursor();
-int db__driver_open_database();
-int db__driver_close_database();
-int db__driver_describe_table();
-int db__driver_init();
-int db__driver_finish();
-int db__driver_execute_immediate();
-int db__driver_fetch();
-int db__driver_get_num_rows();
-int db__driver_list_tables();
-int db__driver_open_select_cursor();
-
#define init_dbdriver() do{\
db_driver_close_cursor = db__driver_close_cursor;\
db_driver_open_database = db__driver_open_database;\
Modified: grass/branches/releasebranch_7_0/db/drivers/postgres/dbdriver.h
===================================================================
--- grass/branches/releasebranch_7_0/db/drivers/postgres/dbdriver.h 2015-11-21 17:40:54 UTC (rev 66883)
+++ grass/branches/releasebranch_7_0/db/drivers/postgres/dbdriver.h 2015-11-21 17:59:42 UTC (rev 66884)
@@ -1,27 +1,8 @@
-/* this file was automatically generated by ../mk_dbdriver_h.sh */
#ifndef DBDRIVER_H
#define DBDRIVER_H
#include <grass/dbstubs.h>
-int db__driver_create_table();
-int db__driver_close_cursor();
-int db__driver_open_database();
-int db__driver_close_database();
-int db__driver_describe_table();
-int db__driver_init();
-int db__driver_finish();
-int db__driver_execute_immediate();
-int db__driver_begin_transaction();
-int db__driver_commit_transaction();
-int db__driver_fetch();
-int db__driver_get_num_rows();
-int db__driver_create_index();
-int db__driver_list_databases();
-int db__driver_list_tables();
-int db__driver_grant_on_table();
-int db__driver_open_select_cursor();
-
#define init_dbdriver() do{\
db_driver_create_table = db__driver_create_table;\
db_driver_close_cursor = db__driver_close_cursor;\
Modified: grass/branches/releasebranch_7_0/db/drivers/sqlite/dbdriver.h
===================================================================
--- grass/branches/releasebranch_7_0/db/drivers/sqlite/dbdriver.h 2015-11-21 17:40:54 UTC (rev 66883)
+++ grass/branches/releasebranch_7_0/db/drivers/sqlite/dbdriver.h 2015-11-21 17:59:42 UTC (rev 66884)
@@ -1,25 +1,8 @@
-/* this file was automatically generated by ../mk_dbdriver_h.sh */
#ifndef DBDRIVER_H
#define DBDRIVER_H
#include <grass/dbstubs.h>
-int db__driver_create_table();
-int db__driver_close_cursor();
-int db__driver_open_database();
-int db__driver_close_database();
-int db__driver_describe_table();
-int db__driver_init();
-int db__driver_finish();
-int db__driver_execute_immediate();
-int db__driver_begin_transaction();
-int db__driver_commit_transaction();
-int db__driver_fetch();
-int db__driver_get_num_rows();
-int db__driver_create_index();
-int db__driver_list_tables();
-int db__driver_open_select_cursor();
-
#define init_dbdriver() do{\
db_driver_create_table = db__driver_create_table;\
db_driver_close_cursor = db__driver_close_cursor;\
Modified: grass/branches/releasebranch_7_0/lib/db/dbmi_base/Makefile
===================================================================
--- grass/branches/releasebranch_7_0/lib/db/dbmi_base/Makefile 2015-11-21 17:40:54 UTC (rev 66883)
+++ grass/branches/releasebranch_7_0/lib/db/dbmi_base/Makefile 2015-11-21 17:59:42 UTC (rev 66884)
@@ -6,7 +6,7 @@
include $(MODULE_TOPDIR)/include/Make/Lib.make
-default: lib
+default: lib $(ARCH_INCDIR)/dbstubs.h
Copied: grass/branches/releasebranch_7_0/lib/db/dbmi_base/dbstubs.h (from rev 66817, grass/trunk/lib/db/dbmi_base/dbstubs.h)
===================================================================
--- grass/branches/releasebranch_7_0/lib/db/dbmi_base/dbstubs.h (rev 0)
+++ grass/branches/releasebranch_7_0/lib/db/dbmi_base/dbstubs.h 2015-11-21 17:59:42 UTC (rev 66884)
@@ -0,0 +1,102 @@
+#ifndef DBSTUBS_H
+#define DBSTUBS_H
+
+extern int db__driver_add_column(dbString *, dbColumn *);
+extern int db__driver_bind_update(dbCursor *);
+extern int db__driver_close_cursor(dbCursor *);
+extern int db__driver_close_database(void);
+extern int db__driver_create_index(dbIndex *);
+extern int db__driver_create_table(dbTable *);
+extern int db__driver_create_database(dbHandle *);
+extern int db__driver_delete(dbCursor *);
+extern int db__driver_delete_database(dbHandle *);
+extern int db__driver_describe_table(dbString *, dbTable **);
+extern int db__driver_drop_column(dbString *, dbString *);
+extern int db__driver_drop_index(dbString *);
+extern int db__driver_drop_table(dbString *);
+extern int db__driver_execute_immediate(dbString *);
+extern int db__driver_fetch(dbCursor *, int, int *);
+extern int db__driver_find_database(dbHandle *, int *);
+extern int db__driver_finish(void);
+extern int db__driver_init(int, char **);
+extern int db__driver_insert(dbCursor *);
+extern int db__driver_list_indexes(dbString *, dbIndex **, int *);
+extern int db__driver_list_tables(dbString **, int *, int);
+extern int db__driver_list_databases(dbString *, int, dbHandle **, int *);
+extern int db__driver_open_insert_cursor(dbCursor *);
+extern int db__driver_open_select_cursor(dbString *, dbCursor *, int);
+extern int db__driver_open_update_cursor(dbString *, dbString *, dbCursor *, int);
+extern int db__driver_open_database(dbHandle *);
+extern int db__driver_grant_on_table(dbString *, int, int);
+extern int db__driver_get_num_rows(dbCursor *);
+extern int db__driver_begin_transaction(void);
+extern int db__driver_commit_transaction(void);
+extern int db__driver_update(dbCursor *);
+
+#ifdef DB_DRIVER_C
+int (*db_driver_add_column) (dbString *, dbColumn *) = db__driver_add_column;
+int (*db_driver_bind_update) (dbCursor *) = db__driver_bind_update;
+int (*db_driver_close_cursor) (dbCursor *) = db__driver_close_cursor;
+int (*db_driver_close_database) (void) = db__driver_close_database;
+int (*db_driver_create_index) (dbIndex *) = db__driver_create_index;
+int (*db_driver_create_table) (dbTable *) = db__driver_create_table;
+int (*db_driver_create_database) (dbHandle *) = db__driver_create_database;
+int (*db_driver_delete) (dbCursor *) = db__driver_delete;
+int (*db_driver_delete_database) (dbHandle *) = db__driver_delete_database;
+int (*db_driver_describe_table) (dbString *, dbTable **) = db__driver_describe_table;
+int (*db_driver_drop_column) (dbString *, dbString *) = db__driver_drop_column;
+int (*db_driver_drop_index) (dbString *) = db__driver_drop_index;
+int (*db_driver_drop_table) (dbString *) = db__driver_drop_table;
+int (*db_driver_execute_immediate) (dbString *) = db__driver_execute_immediate;
+int (*db_driver_fetch) (dbCursor *, int, int *) = db__driver_fetch;
+int (*db_driver_find_database) (dbHandle *, int *) = db__driver_find_database;
+int (*db_driver_finish) (void) = db__driver_finish;
+int (*db_driver_init) (int, char **) = db__driver_init;
+int (*db_driver_insert) (dbCursor *) = db__driver_insert;
+int (*db_driver_list_indexes) (dbString *, dbIndex **, int *) = db__driver_list_indexes;
+int (*db_driver_list_tables) (dbString **, int *, int) = db__driver_list_tables;
+int (*db_driver_list_databases) (dbString *, int, dbHandle **, int *) = db__driver_list_databases;
+int (*db_driver_open_insert_cursor) (dbCursor *) = db__driver_open_insert_cursor;
+int (*db_driver_open_select_cursor) (dbString *, dbCursor *, int) = db__driver_open_select_cursor;
+int (*db_driver_open_update_cursor) (dbString *, dbString *, dbCursor *, int) = db__driver_open_update_cursor;
+int (*db_driver_open_database) (dbHandle *) = db__driver_open_database;
+int (*db_driver_grant_on_table) (dbString *, int, int) = db__driver_grant_on_table;
+int (*db_driver_get_num_rows) (dbCursor *) = db__driver_get_num_rows;
+int (*db_driver_begin_transaction) (void) = db__driver_begin_transaction;
+int (*db_driver_commit_transaction) (void) = db__driver_commit_transaction;
+int (*db_driver_update) (dbCursor *) = db__driver_update;
+#else
+extern int (*db_driver_add_column) (dbString *, dbColumn *);
+extern int (*db_driver_bind_update) (dbCursor *);
+extern int (*db_driver_close_cursor) (dbCursor *);
+extern int (*db_driver_close_database) (void);
+extern int (*db_driver_create_index) (dbIndex *);
+extern int (*db_driver_create_table) (dbTable *);
+extern int (*db_driver_create_database) (dbHandle *);
+extern int (*db_driver_delete) (dbCursor *);
+extern int (*db_driver_delete_database) (dbHandle *);
+extern int (*db_driver_describe_table) (dbString *, dbTable **);
+extern int (*db_driver_drop_column) (dbString *, dbString *);
+extern int (*db_driver_drop_index) (dbString *);
+extern int (*db_driver_drop_table) (dbString *);
+extern int (*db_driver_execute_immediate) (dbString *);
+extern int (*db_driver_fetch) (dbCursor *, int, int *);
+extern int (*db_driver_find_database) (dbHandle *, int *);
+extern int (*db_driver_finish) (void);
+extern int (*db_driver_init) (int, char **);
+extern int (*db_driver_insert) (dbCursor *);
+extern int (*db_driver_list_indexes) (dbString *, dbIndex **, int *);
+extern int (*db_driver_list_tables) (dbString **, int *, int);
+extern int (*db_driver_list_databases) (dbString *, int, dbHandle **, int *);
+extern int (*db_driver_open_insert_cursor) (dbCursor *);
+extern int (*db_driver_open_select_cursor) (dbString *, dbCursor *, int);
+extern int (*db_driver_open_update_cursor) (dbString *, dbString *, dbCursor *, int);
+extern int (*db_driver_open_database) (dbHandle *);
+extern int (*db_driver_grant_on_table) (dbString *, int, int);
+extern int (*db_driver_get_num_rows) (dbCursor *);
+extern int (*db_driver_begin_transaction) (void);
+extern int (*db_driver_commit_transaction) (void);
+extern int (*db_driver_update) (dbCursor *);
+#endif
+
+#endif
Modified: grass/branches/releasebranch_7_0/lib/db/dbmi_driver/Makefile
===================================================================
--- grass/branches/releasebranch_7_0/lib/db/dbmi_driver/Makefile 2015-11-21 17:40:54 UTC (rev 66883)
+++ grass/branches/releasebranch_7_0/lib/db/dbmi_driver/Makefile 2015-11-21 17:59:42 UTC (rev 66884)
@@ -6,5 +6,5 @@
include $(MODULE_TOPDIR)/include/Make/Lib.make
-default: lib $(ARCH_INCDIR)/dbstubs.h
+default: lib
Deleted: grass/branches/releasebranch_7_0/lib/db/dbmi_driver/dbstubs.h
===================================================================
--- grass/branches/releasebranch_7_0/lib/db/dbmi_driver/dbstubs.h 2015-11-21 17:40:54 UTC (rev 66883)
+++ grass/branches/releasebranch_7_0/lib/db/dbmi_driver/dbstubs.h 2015-11-21 17:59:42 UTC (rev 66884)
@@ -1,102 +0,0 @@
-/* this file was automatically generated by mk_dbstubs_h.sh */
-#ifndef DBSTUBS_H
-#define DBSTUBS_H
-
-#ifdef DB_DRIVER_C
-extern int db__driver_add_column();
-extern int db__driver_bind_update();
-extern int db__driver_close_cursor();
-extern int db__driver_close_database();
-extern int db__driver_create_index();
-extern int db__driver_create_table();
-extern int db__driver_create_database();
-extern int db__driver_delete();
-extern int db__driver_delete_database();
-extern int db__driver_describe_table();
-extern int db__driver_drop_column();
-extern int db__driver_drop_index();
-extern int db__driver_drop_table();
-extern int db__driver_execute_immediate();
-extern int db__driver_fetch();
-extern int db__driver_find_database();
-extern int db__driver_finish();
-extern int db__driver_init();
-extern int db__driver_insert();
-extern int db__driver_list_indexes();
-extern int db__driver_list_tables();
-extern int db__driver_list_databases();
-extern int db__driver_open_insert_cursor();
-extern int db__driver_open_select_cursor();
-extern int db__driver_open_update_cursor();
-extern int db__driver_open_database();
-extern int db__driver_grant_on_table();
-extern int db__driver_get_num_rows();
-extern int db__driver_begin_transaction();
-extern int db__driver_commit_transaction();
-extern int db__driver_update();
-int (*db_driver_add_column) () = db__driver_add_column;
-int (*db_driver_bind_update) () = db__driver_bind_update;
-int (*db_driver_close_cursor) () = db__driver_close_cursor;
-int (*db_driver_close_database) () = db__driver_close_database;
-int (*db_driver_create_index) () = db__driver_create_index;
-int (*db_driver_create_table) () = db__driver_create_table;
-int (*db_driver_create_database) () = db__driver_create_database;
-int (*db_driver_delete) () = db__driver_delete;
-int (*db_driver_delete_database) () = db__driver_delete_database;
-int (*db_driver_describe_table) () = db__driver_describe_table;
-int (*db_driver_drop_column) () = db__driver_drop_column;
-int (*db_driver_drop_index) () = db__driver_drop_index;
-int (*db_driver_drop_table) () = db__driver_drop_table;
-int (*db_driver_execute_immediate) () = db__driver_execute_immediate;
-int (*db_driver_fetch) () = db__driver_fetch;
-int (*db_driver_find_database) () = db__driver_find_database;
-int (*db_driver_finish) () = db__driver_finish;
-int (*db_driver_init) () = db__driver_init;
-int (*db_driver_insert) () = db__driver_insert;
-int (*db_driver_list_indexes) () = db__driver_list_indexes;
-int (*db_driver_list_tables) () = db__driver_list_tables;
-int (*db_driver_list_databases) () = db__driver_list_databases;
-int (*db_driver_open_insert_cursor) () = db__driver_open_insert_cursor;
-int (*db_driver_open_select_cursor) () = db__driver_open_select_cursor;
-int (*db_driver_open_update_cursor) () = db__driver_open_update_cursor;
-int (*db_driver_open_database) () = db__driver_open_database;
-int (*db_driver_grant_on_table) () = db__driver_grant_on_table;
-int (*db_driver_get_num_rows) () = db__driver_get_num_rows;
-int (*db_driver_begin_transaction) () = db__driver_begin_transaction;
-int (*db_driver_commit_transaction) () = db__driver_commit_transaction;
-int (*db_driver_update) () = db__driver_update;
-#else
-extern int (*db_driver_add_column) ();
-extern int (*db_driver_bind_update) ();
-extern int (*db_driver_close_cursor) ();
-extern int (*db_driver_close_database) ();
-extern int (*db_driver_create_index) ();
-extern int (*db_driver_create_table) ();
-extern int (*db_driver_create_database) ();
-extern int (*db_driver_delete) ();
-extern int (*db_driver_delete_database) ();
-extern int (*db_driver_describe_table) ();
-extern int (*db_driver_drop_column) ();
-extern int (*db_driver_drop_index) ();
-extern int (*db_driver_drop_table) ();
-extern int (*db_driver_execute_immediate) ();
-extern int (*db_driver_fetch) ();
-extern int (*db_driver_find_database) ();
-extern int (*db_driver_finish) ();
-extern int (*db_driver_init) ();
-extern int (*db_driver_insert) ();
-extern int (*db_driver_list_indexes) ();
-extern int (*db_driver_list_tables) ();
-extern int (*db_driver_list_databases) ();
-extern int (*db_driver_open_insert_cursor) ();
-extern int (*db_driver_open_select_cursor) ();
-extern int (*db_driver_open_update_cursor) ();
-extern int (*db_driver_open_database) ();
-extern int (*db_driver_grant_on_table) ();
-extern int (*db_driver_get_num_rows) ();
-extern int (*db_driver_begin_transaction) ();
-extern int (*db_driver_commit_transaction) ();
-extern int (*db_driver_update) ();
-#endif
-
-#endif
Deleted: grass/branches/releasebranch_7_0/lib/db/dbmi_driver/mk_dbstubs_h.sh
===================================================================
--- grass/branches/releasebranch_7_0/lib/db/dbmi_driver/mk_dbstubs_h.sh 2015-11-21 17:40:54 UTC (rev 66883)
+++ grass/branches/releasebranch_7_0/lib/db/dbmi_driver/mk_dbstubs_h.sh 2015-11-21 17:59:42 UTC (rev 66884)
@@ -1,29 +0,0 @@
-#!/bin/sh
-# generates dbstubs.h
-
-tmp=mk_dbstubs_h.tmp.$$
-cat <<'EOT'> dbstubs.h
-/* this file was automatically generated by mk_dbstubs_h.sh */
-#ifndef DBSTUBS_H
-#define DBSTUBS_H
-
-#ifdef DB_DRIVER_C
-EOT
-
-grep -h '^\( *int *\)\?db__driver' ../stubs/*.c | sed \
- -e 's/^\( *int *\)*/extern int /' \
- -e 's/ *(.*$/();/' > $tmp
-cat $tmp >> dbstubs.h
-sed 's/^extern int *db__\([a-zA-Z_]*\).*$/int (*db_\1)() = db__\1;/' $tmp >> dbstubs.h
-
-cat <<'EOT'>> dbstubs.h
-#else
-EOT
-sed 's/^extern int *db__\([a-zA-Z_]*\).*$/extern int (*db_\1)();/' $tmp >> dbstubs.h
-cat <<'EOT'>> dbstubs.h
-#endif
-
-#endif
-EOT
-
-rm $tmp
Modified: grass/branches/releasebranch_7_0/lib/db/stubs/add_col.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/db/stubs/add_col.c 2015-11-21 17:40:54 UTC (rev 66883)
+++ grass/branches/releasebranch_7_0/lib/db/stubs/add_col.c 2015-11-21 17:59:42 UTC (rev 66884)
@@ -1,4 +1,5 @@
#include <grass/dbmi.h>
+#include <grass/dbstubs.h>
/*!
This function calls db_procedure_not_implemented().
Modified: grass/branches/releasebranch_7_0/lib/db/stubs/bindupdate.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/db/stubs/bindupdate.c 2015-11-21 17:40:54 UTC (rev 66883)
+++ grass/branches/releasebranch_7_0/lib/db/stubs/bindupdate.c 2015-11-21 17:59:42 UTC (rev 66884)
@@ -1,4 +1,5 @@
#include <grass/dbmi.h>
+#include <grass/dbstubs.h>
/*!
\fn int db__driver_bind_update (cursor)
Modified: grass/branches/releasebranch_7_0/lib/db/stubs/close_cursor.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/db/stubs/close_cursor.c 2015-11-21 17:40:54 UTC (rev 66883)
+++ grass/branches/releasebranch_7_0/lib/db/stubs/close_cursor.c 2015-11-21 17:59:42 UTC (rev 66884)
@@ -1,4 +1,5 @@
#include <grass/dbmi.h>
+#include <grass/dbstubs.h>
/*!
This function calls db_procedure_not_implemented().
Modified: grass/branches/releasebranch_7_0/lib/db/stubs/closedb.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/db/stubs/closedb.c 2015-11-21 17:40:54 UTC (rev 66883)
+++ grass/branches/releasebranch_7_0/lib/db/stubs/closedb.c 2015-11-21 17:59:42 UTC (rev 66884)
@@ -1,4 +1,5 @@
#include <grass/dbmi.h>
+#include <grass/dbstubs.h>
int db__driver_close_database(void)
{
Modified: grass/branches/releasebranch_7_0/lib/db/stubs/create_index.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/db/stubs/create_index.c 2015-11-21 17:40:54 UTC (rev 66883)
+++ grass/branches/releasebranch_7_0/lib/db/stubs/create_index.c 2015-11-21 17:59:42 UTC (rev 66884)
@@ -1,4 +1,5 @@
#include <grass/dbmi.h>
+#include <grass/dbstubs.h>
int db__driver_create_index(dbIndex * index)
{
Modified: grass/branches/releasebranch_7_0/lib/db/stubs/create_table.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/db/stubs/create_table.c 2015-11-21 17:40:54 UTC (rev 66883)
+++ grass/branches/releasebranch_7_0/lib/db/stubs/create_table.c 2015-11-21 17:59:42 UTC (rev 66884)
@@ -1,4 +1,5 @@
#include <grass/dbmi.h>
+#include <grass/dbstubs.h>
int db__driver_create_table(dbTable * table)
{
Modified: grass/branches/releasebranch_7_0/lib/db/stubs/createdb.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/db/stubs/createdb.c 2015-11-21 17:40:54 UTC (rev 66883)
+++ grass/branches/releasebranch_7_0/lib/db/stubs/createdb.c 2015-11-21 17:59:42 UTC (rev 66884)
@@ -1,4 +1,5 @@
#include <grass/dbmi.h>
+#include <grass/dbstubs.h>
int db__driver_create_database(dbHandle * handle)
{
Modified: grass/branches/releasebranch_7_0/lib/db/stubs/delete.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/db/stubs/delete.c 2015-11-21 17:40:54 UTC (rev 66883)
+++ grass/branches/releasebranch_7_0/lib/db/stubs/delete.c 2015-11-21 17:59:42 UTC (rev 66884)
@@ -1,4 +1,5 @@
#include <grass/dbmi.h>
+#include <grass/dbstubs.h>
int db__driver_delete(dbCursor * cursor)
{
Modified: grass/branches/releasebranch_7_0/lib/db/stubs/deletedb.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/db/stubs/deletedb.c 2015-11-21 17:40:54 UTC (rev 66883)
+++ grass/branches/releasebranch_7_0/lib/db/stubs/deletedb.c 2015-11-21 17:59:42 UTC (rev 66884)
@@ -1,4 +1,5 @@
#include <grass/dbmi.h>
+#include <grass/dbstubs.h>
int db__driver_delete_database(dbHandle * handle)
{
Modified: grass/branches/releasebranch_7_0/lib/db/stubs/desc_table.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/db/stubs/desc_table.c 2015-11-21 17:40:54 UTC (rev 66883)
+++ grass/branches/releasebranch_7_0/lib/db/stubs/desc_table.c 2015-11-21 17:59:42 UTC (rev 66884)
@@ -1,6 +1,7 @@
#include <grass/dbmi.h>
+#include <grass/dbstubs.h>
-int db__driver_describe_table(dbString * name, dbTable * table)
+int db__driver_describe_table(dbString * name, dbTable ** table)
{
db_procedure_not_implemented("db_describe_table");
return DB_FAILED;
Modified: grass/branches/releasebranch_7_0/lib/db/stubs/drop_col.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/db/stubs/drop_col.c 2015-11-21 17:40:54 UTC (rev 66883)
+++ grass/branches/releasebranch_7_0/lib/db/stubs/drop_col.c 2015-11-21 17:59:42 UTC (rev 66884)
@@ -1,4 +1,5 @@
#include <grass/dbmi.h>
+#include <grass/dbstubs.h>
int db__driver_drop_column(dbString * tableName, dbString * columnName)
{
Modified: grass/branches/releasebranch_7_0/lib/db/stubs/drop_index.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/db/stubs/drop_index.c 2015-11-21 17:40:54 UTC (rev 66883)
+++ grass/branches/releasebranch_7_0/lib/db/stubs/drop_index.c 2015-11-21 17:59:42 UTC (rev 66884)
@@ -1,4 +1,5 @@
#include <grass/dbmi.h>
+#include <grass/dbstubs.h>
int db__driver_drop_index(dbString * name)
{
Modified: grass/branches/releasebranch_7_0/lib/db/stubs/drop_table.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/db/stubs/drop_table.c 2015-11-21 17:40:54 UTC (rev 66883)
+++ grass/branches/releasebranch_7_0/lib/db/stubs/drop_table.c 2015-11-21 17:59:42 UTC (rev 66884)
@@ -1,4 +1,5 @@
#include <grass/dbmi.h>
+#include <grass/dbstubs.h>
int db__driver_drop_table(dbString * name)
{
Modified: grass/branches/releasebranch_7_0/lib/db/stubs/execute.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/db/stubs/execute.c 2015-11-21 17:40:54 UTC (rev 66883)
+++ grass/branches/releasebranch_7_0/lib/db/stubs/execute.c 2015-11-21 17:59:42 UTC (rev 66884)
@@ -1,4 +1,5 @@
#include <grass/dbmi.h>
+#include <grass/dbstubs.h>
int db__driver_execute_immediate(dbString * SQLstatement)
{
Modified: grass/branches/releasebranch_7_0/lib/db/stubs/fetch.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/db/stubs/fetch.c 2015-11-21 17:40:54 UTC (rev 66883)
+++ grass/branches/releasebranch_7_0/lib/db/stubs/fetch.c 2015-11-21 17:59:42 UTC (rev 66884)
@@ -1,4 +1,5 @@
#include <grass/dbmi.h>
+#include <grass/dbstubs.h>
int db__driver_fetch(dbCursor * cursor, int position, int *more)
{
Modified: grass/branches/releasebranch_7_0/lib/db/stubs/finddb.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/db/stubs/finddb.c 2015-11-21 17:40:54 UTC (rev 66883)
+++ grass/branches/releasebranch_7_0/lib/db/stubs/finddb.c 2015-11-21 17:59:42 UTC (rev 66884)
@@ -1,4 +1,5 @@
#include <grass/dbmi.h>
+#include <grass/dbstubs.h>
int db__driver_find_database(dbHandle * handle, int *found)
{
Modified: grass/branches/releasebranch_7_0/lib/db/stubs/finish.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/db/stubs/finish.c 2015-11-21 17:40:54 UTC (rev 66883)
+++ grass/branches/releasebranch_7_0/lib/db/stubs/finish.c 2015-11-21 17:59:42 UTC (rev 66884)
@@ -1,4 +1,5 @@
#include <grass/dbmi.h>
+#include <grass/dbstubs.h>
int db__driver_finish(void)
{
Modified: grass/branches/releasebranch_7_0/lib/db/stubs/init.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/db/stubs/init.c 2015-11-21 17:40:54 UTC (rev 66883)
+++ grass/branches/releasebranch_7_0/lib/db/stubs/init.c 2015-11-21 17:59:42 UTC (rev 66884)
@@ -1,4 +1,5 @@
#include <grass/dbmi.h>
+#include <grass/dbstubs.h>
int db__driver_init(int argc, char *argv[])
{
Modified: grass/branches/releasebranch_7_0/lib/db/stubs/insert.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/db/stubs/insert.c 2015-11-21 17:40:54 UTC (rev 66883)
+++ grass/branches/releasebranch_7_0/lib/db/stubs/insert.c 2015-11-21 17:59:42 UTC (rev 66884)
@@ -1,4 +1,5 @@
#include <grass/dbmi.h>
+#include <grass/dbstubs.h>
int db__driver_insert(dbCursor * cursor)
{
Modified: grass/branches/releasebranch_7_0/lib/db/stubs/list_index.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/db/stubs/list_index.c 2015-11-21 17:40:54 UTC (rev 66883)
+++ grass/branches/releasebranch_7_0/lib/db/stubs/list_index.c 2015-11-21 17:59:42 UTC (rev 66884)
@@ -1,4 +1,5 @@
#include <grass/dbmi.h>
+#include <grass/dbstubs.h>
int
db__driver_list_indexes(dbString * tableName, dbIndex ** indexes, int *count)
Modified: grass/branches/releasebranch_7_0/lib/db/stubs/list_tables.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/db/stubs/list_tables.c 2015-11-21 17:40:54 UTC (rev 66883)
+++ grass/branches/releasebranch_7_0/lib/db/stubs/list_tables.c 2015-11-21 17:59:42 UTC (rev 66884)
@@ -1,4 +1,5 @@
#include <grass/dbmi.h>
+#include <grass/dbstubs.h>
int db__driver_list_tables(dbString ** names, int *count, int system)
{
Modified: grass/branches/releasebranch_7_0/lib/db/stubs/listdb.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/db/stubs/listdb.c 2015-11-21 17:40:54 UTC (rev 66883)
+++ grass/branches/releasebranch_7_0/lib/db/stubs/listdb.c 2015-11-21 17:59:42 UTC (rev 66884)
@@ -1,4 +1,5 @@
#include <grass/dbmi.h>
+#include <grass/dbstubs.h>
int
db__driver_list_databases(dbString * path, int npaths, dbHandle ** handles,
Modified: grass/branches/releasebranch_7_0/lib/db/stubs/open_insert.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/db/stubs/open_insert.c 2015-11-21 17:40:54 UTC (rev 66883)
+++ grass/branches/releasebranch_7_0/lib/db/stubs/open_insert.c 2015-11-21 17:59:42 UTC (rev 66884)
@@ -1,4 +1,5 @@
#include <grass/dbmi.h>
+#include <grass/dbstubs.h>
int db__driver_open_insert_cursor(dbCursor * cursor)
{
Modified: grass/branches/releasebranch_7_0/lib/db/stubs/open_select.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/db/stubs/open_select.c 2015-11-21 17:40:54 UTC (rev 66883)
+++ grass/branches/releasebranch_7_0/lib/db/stubs/open_select.c 2015-11-21 17:59:42 UTC (rev 66884)
@@ -1,7 +1,8 @@
#include <grass/dbmi.h>
+#include <grass/dbstubs.h>
int
-db__driver_open_select_cursor(dbString * select, dbCursor * cursor, int *mode)
+db__driver_open_select_cursor(dbString * select, dbCursor * cursor, int mode)
{
db_procedure_not_implemented("db_open_select_cursor");
return DB_FAILED;
Modified: grass/branches/releasebranch_7_0/lib/db/stubs/open_update.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/db/stubs/open_update.c 2015-11-21 17:40:54 UTC (rev 66883)
+++ grass/branches/releasebranch_7_0/lib/db/stubs/open_update.c 2015-11-21 17:59:42 UTC (rev 66884)
@@ -1,8 +1,9 @@
#include <grass/dbmi.h>
+#include <grass/dbstubs.h>
int
db__driver_open_update_cursor(dbString * name, dbString * select,
- dbCursor * cursor, int *mode)
+ dbCursor * cursor, int mode)
{
db_procedure_not_implemented("db_open_update_cursor");
return DB_FAILED;
Modified: grass/branches/releasebranch_7_0/lib/db/stubs/opendb.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/db/stubs/opendb.c 2015-11-21 17:40:54 UTC (rev 66883)
+++ grass/branches/releasebranch_7_0/lib/db/stubs/opendb.c 2015-11-21 17:59:42 UTC (rev 66884)
@@ -1,4 +1,5 @@
#include <grass/dbmi.h>
+#include <grass/dbstubs.h>
int db__driver_open_database(dbHandle * handle)
{
Modified: grass/branches/releasebranch_7_0/lib/db/stubs/priv.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/db/stubs/priv.c 2015-11-21 17:40:54 UTC (rev 66883)
+++ grass/branches/releasebranch_7_0/lib/db/stubs/priv.c 2015-11-21 17:59:42 UTC (rev 66884)
@@ -1,4 +1,5 @@
#include <grass/dbmi.h>
+#include <grass/dbstubs.h>
int db__driver_grant_on_table(dbString * tableName, int priv, int to)
{
Modified: grass/branches/releasebranch_7_0/lib/db/stubs/rows.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/db/stubs/rows.c 2015-11-21 17:40:54 UTC (rev 66883)
+++ grass/branches/releasebranch_7_0/lib/db/stubs/rows.c 2015-11-21 17:59:42 UTC (rev 66884)
@@ -1,4 +1,5 @@
#include <grass/dbmi.h>
+#include <grass/dbstubs.h>
int db__driver_get_num_rows(dbCursor * cursor)
{
Modified: grass/branches/releasebranch_7_0/lib/db/stubs/transaction.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/db/stubs/transaction.c 2015-11-21 17:40:54 UTC (rev 66883)
+++ grass/branches/releasebranch_7_0/lib/db/stubs/transaction.c 2015-11-21 17:59:42 UTC (rev 66884)
@@ -1,4 +1,5 @@
#include <grass/dbmi.h>
+#include <grass/dbstubs.h>
/* Implemented only in some drivers */
int db__driver_begin_transaction(void)
Modified: grass/branches/releasebranch_7_0/lib/db/stubs/update.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/db/stubs/update.c 2015-11-21 17:40:54 UTC (rev 66883)
+++ grass/branches/releasebranch_7_0/lib/db/stubs/update.c 2015-11-21 17:59:42 UTC (rev 66884)
@@ -1,4 +1,5 @@
#include <grass/dbmi.h>
+#include <grass/dbstubs.h>
int db__driver_update(dbCursor * cursor)
{
More information about the grass-commit
mailing list