Merge pull request #19 from webbed88/master

correct 'this ‘if’ clause does not guard' error when using make
mydumper · Oct 21, 2016 · 03cb519 · 03cb519
2 parents fb07aea + a59526b
commit 03cb519
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 16 deletions.
diff --git a/mydumper.c b/mydumper.c
@@ -404,9 +404,10 @@ void *process_queue(struct thread_data *td) {
 	MYSQL *thrconn = mysql_init(NULL);
 	g_mutex_unlock(init_mutex);
 
-    if (defaults_file != NULL)
-    	mysql_options(thrconn,MYSQL_READ_DEFAULT_FILE,defaults_file);
-	mysql_options(thrconn,MYSQL_READ_DEFAULT_GROUP,"mydumper");
+	if (defaults_file != NULL) {
+		mysql_options(thrconn,MYSQL_READ_DEFAULT_FILE,defaults_file);
+		mysql_options(thrconn,MYSQL_READ_DEFAULT_GROUP,"mydumper");
+	}
 
 	if (compress_protocol)
 		mysql_options(thrconn,MYSQL_OPT_COMPRESS,NULL);
@@ -606,10 +607,11 @@ void *process_queue_less_locking(struct thread_data *td) {
 	g_mutex_lock(init_mutex);
 	MYSQL *thrconn = mysql_init(NULL);
 	g_mutex_unlock(init_mutex);
-
-    if (defaults_file != NULL)
-    	mysql_options(thrconn,MYSQL_READ_DEFAULT_FILE,defaults_file);
-	mysql_options(thrconn,MYSQL_READ_DEFAULT_GROUP,"mydumper");
+
+	if (defaults_file != NULL) {
+		mysql_options(thrconn,MYSQL_READ_DEFAULT_FILE,defaults_file);
+		mysql_options(thrconn,MYSQL_READ_DEFAULT_GROUP,"mydumper");
+	}
 
 	if (compress_protocol)
 		mysql_options(thrconn,MYSQL_OPT_COMPRESS,NULL);
@@ -946,9 +948,10 @@ MYSQL *create_main_connection()
 {
 	MYSQL *conn;
 	conn = mysql_init(NULL);
-    if (defaults_file != NULL)
-    	mysql_options(conn,MYSQL_READ_DEFAULT_FILE,defaults_file);
-	mysql_options(conn,MYSQL_READ_DEFAULT_GROUP,"mydumper");
+	if (defaults_file != NULL) {
+		mysql_options(conn,MYSQL_READ_DEFAULT_FILE,defaults_file);
+		mysql_options(conn,MYSQL_READ_DEFAULT_GROUP,"mydumper");
+	}
 
 	if (!mysql_real_connect(conn, hostname, username, password, db, port, socket_path, 0)) {
 		g_critical("Error connecting to database: %s", mysql_error(conn));

diff --git a/myloader.c b/myloader.c
@@ -133,9 +133,10 @@ int main(int argc, char *argv[]) {
 
 	MYSQL *conn;
 	conn= mysql_init(NULL);
-    if (defaults_file != NULL)
-    	mysql_options(conn,MYSQL_READ_DEFAULT_FILE,defaults_file);
-	mysql_options(conn, MYSQL_READ_DEFAULT_GROUP, "myloader");
+	if (defaults_file != NULL) {
+		mysql_options(conn,MYSQL_READ_DEFAULT_FILE,defaults_file);
+		mysql_options(conn, MYSQL_READ_DEFAULT_GROUP, "myloader");
+	}
 
 	if (!mysql_real_connect(conn, hostname, username, password, NULL, port, socket_path, 0)) {
 		g_critical("Error connection to database: %s", mysql_error(conn));
@@ -407,9 +408,10 @@ void *process_queue(struct thread_data *td) {
 	MYSQL *thrconn= mysql_init(NULL);
 	g_mutex_unlock(init_mutex);
 
-    if (defaults_file != NULL)
-    	mysql_options(thrconn,MYSQL_READ_DEFAULT_FILE,defaults_file);
-	mysql_options(thrconn, MYSQL_READ_DEFAULT_GROUP, "myloader");
+	if (defaults_file != NULL) {
+		mysql_options(thrconn,MYSQL_READ_DEFAULT_FILE,defaults_file);
+		mysql_options(thrconn, MYSQL_READ_DEFAULT_GROUP, "myloader");
+	}
 
 	if (compress_protocol)
 		mysql_options(thrconn, MYSQL_OPT_COMPRESS, NULL);