Updated wrong log entries

Removed old and obsolete expressions used to reference the eurephia database driver.

Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>

3 files changed, 10 insertions, 10 deletions

diff --git a/common/eurephia_getsym.c b/common/eurephia_getsym.c
index d7268ff..587254e 100644
--- a/common/eurephia_getsym.c
+++ b/common/eurephia_getsym.c
@@ -54,7 +54,7 @@ void *eGetSym(eurephiaCTX *ctx, void *dlh, const char *symnam)
         DEBUG(ctx, 30, "Locating driver function '%s'", symnam);
         func = dlsym(dlh, symnam);
         if( func == NULL ) {
-                eurephia_log(ctx, LOG_PANIC, 0, "Could not find needed '%s' function in eDBlink driver", symnam);
+                eurephia_log(ctx, LOG_PANIC, 0, "Could not find needed '%s' function in driver", symnam);
                 ctx->fatal_error = 1;
         }
         return func;
diff --git a/database/eurephiadb.c b/database/eurephiadb.c
index ff3a168..d4618d3 100644
--- a/database/eurephiadb.c
+++ b/database/eurephiadb.c
@@ -50,7 +50,7 @@ int eDBlink_close(eurephiaCTX *ctx)
                 return 1;
         }
 
-        eurephia_log(ctx, LOG_INFO, 3, "Unloading eurephiaDB driver");
+        eurephia_log(ctx, LOG_INFO, 3, "Unloading eurephia database driver");
         if( ctx->eurephia_driver != NULL ) {
                 dlclose(ctx->eurephia_driver);
                 ctx->eurephia_driver = NULL;
@@ -71,15 +71,15 @@ int eDBlink_close(eurephiaCTX *ctx)
 int eDBlink_init(eurephiaCTX *ctx, const char *dbdriver, const int minver)
 {
         if( dbdriver == NULL ) {
-                eurephia_log(ctx, LOG_FATAL, 0, "No eurephia eDBlink driver given.  "
+                eurephia_log(ctx, LOG_FATAL, 0, "No eurephia database driver configured.  "
                              "eurephia authentication will not be available");
                 return 0;
         }
-        eurephia_log(ctx, LOG_INFO, 2, "Loading eurephiaDB driver: %s", dbdriver);
+        eurephia_log(ctx, LOG_INFO, 2, "Loading eurephia database driver: %s", dbdriver);
 
         ctx->eurephia_driver = dlopen(dbdriver, RTLD_NOW);
         if( ctx->eurephia_driver == NULL ) {
-                eurephia_log(ctx, LOG_FATAL, 0, "Could not open the eurephia eDBlink driver (%s)", dbdriver);
+                eurephia_log(ctx, LOG_FATAL, 0, "Could not open the eurephia database driver (%s)", dbdriver);
                 eurephia_log(ctx, LOG_FATAL, 1, "dlopen error: %s", dlerror());
                 return 0;
         }
@@ -94,7 +94,7 @@ int eDBlink_init(eurephiaCTX *ctx, const char *dbdriver, const int minver)
         // Check that we are using at least a new enough driver
         if( eDB_DriverAPIVersion() < minver ) {
                 eurephia_log(ctx, LOG_FATAL, 0,
-                             "The requested eurephiaDB driver is too old.  This program needs "
+                             "The requested eurephia database driver is too old.  This program needs "
                              "API version %i, but this driver only supports API version %i.\n",
                              minver, eDB_DriverAPIVersion());
                 return 0;
@@ -104,8 +104,8 @@ int eDBlink_init(eurephiaCTX *ctx, const char *dbdriver, const int minver)
         switch( (eDB_DriverAPIVersion() > minver ? minver : eDB_DriverAPIVersion()) ) {
         default:
                 eurephia_log(ctx, LOG_WARNING, 0,
-                             "eurephiaDB driver API is newer than the running eurephia version.  Consider "
-                             "to upgrade eurephia to take advantage of newer features in the eurephiaDB driver.");
+                             "eurephia database driver API is newer than the running eurephia version.  Consider "
+                             "to upgrade eurephia to take advantage of newer features in the driver.");
         case 2:
 #ifdef ENABLE_EUREPHIADM
                 eDBadminAuthenticate           = eGetSym(ctx, ctx->eurephia_driver, "eDBadminAuthenticate");
@@ -153,7 +153,7 @@ int eDBlink_init(eurephiaCTX *ctx, const char *dbdriver, const int minver)
                 break;
         }
         if( ctx->fatal_error > 0 ) {
-                eurephia_log(ctx, LOG_FATAL, 0, "eurephia eDBlink is not correctly initialised.  "
+                eurephia_log(ctx, LOG_FATAL, 0, "The eurephia database driver is not correctly initialised.  "
                              "eurephia authentication will not be available");
                 eDBlink_close(ctx);
                 return 0;
diff --git a/plugin/firewall/eurephiafw.c b/plugin/firewall/eurephiafw.c
index 9ef8ce0..12fb697 100644
--- a/plugin/firewall/eurephiafw.c
+++ b/plugin/firewall/eurephiafw.c
@@ -111,7 +111,7 @@ int eFW_load(eurephiaCTX *ctx, const char *intf) {
                 eurephia_log(ctx, LOG_WARNING, 0,
                              "eurephia Firewall interface API is newer than what the running eurephia version is "
                              "familiar with.  Please consider to upgrade eurephia to take advantage of newer "
-                             "features in the eurephiaDB driver.");
+                             "features in the firewall driver.");
 
         case 1:
                 eFW_RunFirewall = eGetSym(ctx, ctx->eurephia_fw_intf, "eFW_RunFirewall");