gpg: Avoid name spaces clash with future sqlite versions.

* g10/sqlite.c: Rename to gpgsql.c.  Change function prefixes to
gpgsql_.
* g10/sqlite.h: Rename to gpgsql.h.
* g10/tofu.c: Adjust for changes.
--

We used for our own extensions symbols with an sqlite_ names prefix.
This may in theory lead to duplicated symbols but more important, it
is harder to understand what is from gpg and what is from libsqlite.

Signed-off-by: Werner Koch <[email protected]>

1 files changed, 0 insertions, 62 deletions

diff --git a/g10/sqlite.h b/g10/sqlite.h
deleted file mode 100644
index 753e37a73..000000000
--- a/g10/sqlite.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* sqlite.h - SQLite helper functions.
- * Copyright (C) 2015 g10 Code GmbH
- *
- * This file is part of GnuPG.
- *
- * GnuPG is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * GnuPG is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef GNUPG_SQLITE_H
-#define GNUPG_SQLITE_H
-
-#include <sqlite3.h>
-
-enum sqlite_arg_type
-  {
-    SQLITE_ARG_END = 0xdead001,
-    SQLITE_ARG_INT,
-    SQLITE_ARG_LONG_LONG,
-    SQLITE_ARG_STRING,
-    /* This takes two arguments: the blob as a void * and the length
-       of the blob as a long long.  */
-    SQLITE_ARG_BLOB
-  };
-
-
-int sqlite3_exec_printf (sqlite3 *db,
-                         int (*callback)(void*,int,char**,char**), void *cookie,
-                         char **errmsg,
-                         const char *sql, ...);
-
-typedef int (*sqlite3_stepx_callback) (void *cookie,
-                                       /* number of columns.  */
-                                       int cols,
-                                       /* columns as text.  */
-                                       char **values,
-                                       /* column names.  */
-                                       char **names,
-                                       /* The prepared statement so
-                                          that it is possible to use
-                                          something like
-                                          sqlite3_column_blob().  */
-                                       sqlite3_stmt *statement);
-
-int sqlite3_stepx (sqlite3 *db,
-                   sqlite3_stmt **stmtp,
-                   sqlite3_stepx_callback callback,
-                   void *cookie,
-                   char **errmsg,
-                   const char *sql, ...);
-
-#endif