From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Tue, 4 Nov 2014 05:08:16 +0000 (-0500)
Subject: Formatting in mysql driver
X-Git-Tag: branch_3_1_x~4779
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d838cfbbd70ef3a04b2ef2fd7e19da2a491eb9d9;p=thirdparty%2Ffreeradius-server.git

Formatting in mysql driver
---

diff --git a/src/modules/rlm_sql/rlm_sql.c b/src/modules/rlm_sql/rlm_sql.c
index db021d73aae..f49dc760121 100644
--- a/src/modules/rlm_sql/rlm_sql.c
+++ b/src/modules/rlm_sql/rlm_sql.c
@@ -857,8 +857,7 @@ static int mod_instantiate(CONF_SECTION *conf, void *instance)
 	 *	Sanity check for crazy people.
 	 */
 	if (strncmp(inst->config->sql_driver_name, "rlm_sql_", 8) != 0) {
-		ERROR("rlm_sql (%s): \"%s\" is NOT an SQL driver!",
-		       inst->config->xlat_name, inst->config->sql_driver_name);
+		ERROR("rlm_sql (%s): \"%s\" is NOT an SQL driver!", inst->config->xlat_name, inst->config->sql_driver_name);
 		return -1;
 	}
 
@@ -867,20 +866,15 @@ static int mod_instantiate(CONF_SECTION *conf, void *instance)
 	 */
 	inst->handle = lt_dlopenext(inst->config->sql_driver_name);
 	if (!inst->handle) {
-		ERROR("Could not link driver %s: %s",
-		       inst->config->sql_driver_name,
-		       dlerror());
-		ERROR("Make sure it (and all its dependent libraries!)"
-		       "are in the search path of your system's ld");
+		ERROR("Could not link driver %s: %s", inst->config->sql_driver_name, dlerror());
+		ERROR("Make sure it (and all its dependent libraries!) are in the search path of your system's ld");
 		return -1;
 	}
 
 	inst->module = (rlm_sql_module_t *) dlsym(inst->handle,
 						  inst->config->sql_driver_name);
 	if (!inst->module) {
-		ERROR("Could not link symbol %s: %s",
-		       inst->config->sql_driver_name,
-		       dlerror());
+		ERROR("Could not link symbol %s: %s", inst->config->sql_driver_name, dlerror());
 		return -1;
 	}
 
@@ -917,15 +911,13 @@ static int mod_instantiate(CONF_SECTION *conf, void *instance)
 		return -1;
 	}
 
-	INFO("rlm_sql (%s): Driver %s (module %s) loaded and linked",
-	       inst->config->xlat_name, inst->config->sql_driver_name,
-	       inst->module->name);
+	INFO("rlm_sql (%s): Driver %s (module %s) loaded and linked", inst->config->xlat_name,
+	     inst->config->sql_driver_name, inst->module->name);
 
 	/*
 	 *	Initialise the connection pool for this instance
 	 */
-	INFO("rlm_sql (%s): Attempting to connect to database \"%s\"",
-	       inst->config->xlat_name, inst->config->sql_db);
+	INFO("rlm_sql (%s): Attempting to connect to database \"%s\"", inst->config->xlat_name, inst->config->sql_db);
 
 	if (sql_socket_pool_init(inst) < 0) return -1;