Merge c1f604178f into 5cb74797fe

New function, `void pgsql_handle_set_error_if_not_set(switch_pgsql_handle_t *handle, char **err)` has been added to mod_pgsql module. This function is now called at several points where an error occurred but *err was not yet set.

src/mod/databases/mod_pgsql/mod_pgsql.c

@@ -106,6 +106,22 @@ char * pgsql_handle_get_error(switch_pgsql_handle_t *handle)
 	return err_str;
 }
 
+void pgsql_handle_set_error_if_not_set(switch_pgsql_handle_t *handle, char **err)
+{
+	char *err_str;
+
+	if (err && !(*err)) {
+		err_str = pgsql_handle_get_error(handle);
+
+		if (zstr(err_str)) {
+			switch_safe_free(err_str);
+			err_str = strdup((char *)"SQL ERROR!");
+		}
+
+		*err = err_str;
+	}
+}
+
 static int db_is_up(switch_pgsql_handle_t *handle)
 {
 	int ret = 0;
@@ -553,8 +569,15 @@ switch_status_t pgsql_handle_exec_detailed(const char *file, const char *func, i
 		goto error;
 	}
 
-	return pgsql_finish_results(handle);
+	if (pgsql_finish_results(handle) != SWITCH_STATUS_SUCCESS) {
+		goto error;
+	}
+
+	return SWITCH_STATUS_SUCCESS;
+
 error:
+	pgsql_handle_set_error_if_not_set(handle, err);
+
 	return SWITCH_STATUS_FALSE;
 }
 
@@ -630,6 +653,7 @@ done:
 
 	pgsql_free_result(&result);
 	if (pgsql_finish_results(handle) != SWITCH_STATUS_SUCCESS) {
+		pgsql_handle_set_error_if_not_set(handle, err);
 		sstatus = SWITCH_STATUS_FALSE;
 	}
 
@@ -638,6 +662,7 @@ done:
 error:
 
 	pgsql_free_result(&result);
+	pgsql_handle_set_error_if_not_set(handle, err);
 
 	return SWITCH_STATUS_FALSE;
 }
@@ -1050,6 +1075,8 @@ switch_status_t pgsql_handle_callback_exec_detailed(const char *file, const char
 	return SWITCH_STATUS_SUCCESS;
 error:
 
+	pgsql_handle_set_error_if_not_set(handle, err);
+
 	return SWITCH_STATUS_FALSE;
 }
 

src/switch_utils.c

@@ -2876,21 +2876,19 @@ SWITCH_DECLARE(unsigned int) switch_separate_string(char *buf, char delim, char
 
 SWITCH_DECLARE(const char *) switch_cut_path(const char *in)
 {
-	const char *p, *ret = in;
+	const char *p = in, *ret = in;
-	const char delims[] = "/\\";
-	const char *i;
 
-	if (in) {
+	if (NULL == in) {
-		for (i = delims; *i; i++) {
-			p = in;
-			while ((p = strchr(p, *i)) != 0) {
-				ret = ++p;
-			}
-		}
-		return ret;
-	} else {
 		return NULL;
 	}
+	while ((p = strchr(ret, '/')) != NULL) {
+		ret = ++p;
+	}
+	while ((p = strchr(ret, '\\')) != NULL) {
+		ret = ++p;
+	}
+
+	return ret;
 }
 
 SWITCH_DECLARE(switch_status_t) switch_string_match(const char *string, size_t string_len, const char *search, size_t search_len)

tests/unit/switch_utils.c

@@ -59,6 +59,12 @@ FST_TEST_BEGIN(benchmark)
     switch_url_encode(s, encoded, sizeof(encoded));
     switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "encoded: [%s]\n", encoded);
     fst_check_string_equals(encoded, "%26bry%C3%A4n%23!%E6%9D%9C%E9%87%91%E6%88%BF");
+
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "check the switch_cut_path\n");
+	fst_check_string_equals(switch_cut_path("switch-cut-path"), "switch-cut-path");
+	fst_check_string_equals(switch_cut_path("switch/cut-path"), "cut-path");
+	fst_check_string_equals(switch_cut_path("switch/cut\\path"), "path");
+	fst_check_string_equals(switch_cut_path("switch\\cut/path"), "path");
 }
 FST_TEST_END()