Bläddra i källkod

dbmi_driver lib: fix driver error state

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@54870 15284696-431f-4ddb-bdfa-cd5b030d7da7
Markus Metz 12 år sedan
förälder
incheckning
c931fa6789
1 ändrade filer med 11 tillägg och 10 borttagningar
  1. 11 10
      lib/db/dbmi_driver/d_error.c

+ 11 - 10
lib/db/dbmi_driver/d_error.c

@@ -21,14 +21,21 @@
 #include <grass/glocale.h>
 
 /* initialize the global struct */
-struct state {
+struct error_state {
     char     *driver_name;
     dbString *errMsg;
-} state;
+};
 
-struct state *st = &state;
+static struct error_state state;
+static struct error_state *st = &state;
+
+static void init()
+{
+    db_set_string(st->errMsg, "");
+    db_d_append_error(_("DBMI-%s driver error:"), st->driver_name);
+    db_append_string(st->errMsg, "\n");
+}
 
-static void init();
 
 /*!
   \brief Init error message for DB driver
@@ -51,12 +58,6 @@ void db_d_init_error(const char *name)
     init();
 }
 
-void init()
-{
-    db_set_string(st->errMsg, "");
-    db_d_append_error(_("DBMI-%s driver error:"), st->driver_name);
-    db_append_string(st->errMsg, "\n");
-}
 /*!
   \brief Append error message for DB driver