aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Teirney <david@teirney.net>2012-06-19 22:28:56 +1200
committerDavid Teirney <david@teirney.net>2012-06-19 22:28:56 +1200
commit648718a3c99687dcaa60a1323c575cac9381699b (patch)
treecc00409cee48f675d9eea5ea80b09f20da5b1079
parentfde1934cf3f5d211039f0ed76b084d3205d55c93 (diff)
[libcmyth] Cosmetic: move location of cmyth_conn_get_setting in file to match upstream.
-rw-r--r--lib/cmyth/libcmyth/connection.c23
1 files changed, 11 insertions, 12 deletions
diff --git a/lib/cmyth/libcmyth/connection.c b/lib/cmyth/libcmyth/connection.c
index 6ff1d2da39..58c860c9d5 100644
--- a/lib/cmyth/libcmyth/connection.c
+++ b/lib/cmyth/libcmyth/connection.c
@@ -1360,18 +1360,6 @@ cmyth_conn_get_free_recorder_count(cmyth_conn_t conn)
return ret;
}
-char *
-cmyth_conn_get_setting(cmyth_conn_t conn, const char* hostname, const char* setting)
-{
- char* result = NULL;
-
- pthread_mutex_lock(&mutex);
- result = cmyth_conn_get_setting_unlocked(conn, hostname, setting);
- pthread_mutex_unlock(&mutex);
-
- return result;
-}
-
static char *
cmyth_conn_get_setting_unlocked(cmyth_conn_t conn, const char* hostname, const char* setting)
{
@@ -1431,3 +1419,14 @@ err:
return NULL;
}
+char *
+cmyth_conn_get_setting(cmyth_conn_t conn, const char* hostname, const char* setting)
+{
+ char* result = NULL;
+
+ pthread_mutex_lock(&mutex);
+ result = cmyth_conn_get_setting_unlocked(conn, hostname, setting);
+ pthread_mutex_unlock(&mutex);
+
+ return result;
+}