From ddb837cdcd1ac274f5561d0b5102cd8e94b75208 Mon Sep 17 00:00:00 2001 From: James Booth Date: Mon, 1 Jun 2015 22:02:18 +0100 Subject: [PATCH] Renamed stbbr_for -> stbbr_for_id --- src/client/stabber.c | 4 ++-- src/server/httpapi.c | 2 +- src/server/prime.c | 2 +- src/server/prime.h | 2 +- stabber.h | 2 +- stabbertest.c | 8 ++++---- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/client/stabber.c b/src/client/stabber.c index 2536e47..ba815a6 100644 --- a/src/client/stabber.c +++ b/src/client/stabber.c @@ -52,9 +52,9 @@ stbbr_auth_passwd(char *password) } int -stbbr_for(char *id, char *stream) +stbbr_for_id(char *id, char *stream) { - prime_for(id, stream); + prime_for_id(id, stream); return 1; } diff --git a/src/server/httpapi.c b/src/server/httpapi.c index 77403ea..1f81f08 100644 --- a/src/server/httpapi.c +++ b/src/server/httpapi.c @@ -125,7 +125,7 @@ int connection_cb(void* cls, struct MHD_Connection* conn, const char* url, const case STBBR_OP_FOR: id = MHD_lookup_connection_value(conn, MHD_GET_ARGUMENT_KIND, "id"); if (id) { - prime_for(id, con_info->body->str); + prime_for_id(id, con_info->body->str); return send_response(conn, NULL, MHD_HTTP_OK); } else { return send_response(conn, NULL, MHD_HTTP_BAD_REQUEST); diff --git a/src/server/prime.c b/src/server/prime.c index 72d6f19..ace1e0a 100644 --- a/src/server/prime.c +++ b/src/server/prime.c @@ -61,7 +61,7 @@ prime_get_passwd(void) } void -prime_for(const char *id, char *stream) +prime_for_id(const char *id, char *stream) { if (idstubs) { g_hash_table_insert(idstubs, strdup(id), strdup(stream)); diff --git a/src/server/prime.h b/src/server/prime.h index 41e0759..926baaf 100644 --- a/src/server/prime.h +++ b/src/server/prime.h @@ -29,7 +29,7 @@ void prime_free_all(void); void prime_required_passwd(char *password); char* prime_get_passwd(void); -int prime_for(const char *id, char *stream); +int prime_for_id(const char *id, char *stream); char* prime_get_for(const char *id); #endif diff --git a/stabber.h b/stabber.h index b221f73..6c911f8 100644 --- a/stabber.h +++ b/stabber.h @@ -29,7 +29,7 @@ void stbbr_stop(void); void stbbr_set_timeout(int seconds); int stbbr_auth_passwd(char *password); -void stbbr_for(char *id, char *stream); +void stbbr_for_id(char *id, char *stream); void stbbr_wait_for(char *id); diff --git a/stabbertest.c b/stabbertest.c index e74020d..9f17b10 100644 --- a/stabbertest.c +++ b/stabbertest.c @@ -8,7 +8,7 @@ int main(void) stbbr_auth_passwd("password"); - stbbr_for("roster", + stbbr_for_id("roster", "" "" "" @@ -16,7 +16,7 @@ int main(void) "" ""); - stbbr_for("prof_presence_1", + stbbr_for_id("prof_presence_1", "" "dnd" "busy!" @@ -30,12 +30,12 @@ int main(void) "Out of office" ""); - stbbr_for("prof_msg_2", + stbbr_for_id("prof_msg_2", "" "Welcome!!" ""); - stbbr_for("prof_msg_3", + stbbr_for_id("prof_msg_3", "" "From me laptop" "");