Unverified Commit d6fd791f authored by Shawn Webb's avatar Shawn Webb
Browse files

Rename pushover_message_set_user to pushover_message_set_dest



Properly reflect that we're setting the destination token rather than
some random user token.
Signed-off-by: Shawn Webb's avatarShawn Webb <shawn.webb@hardenedbsd.org>
parent 7e39e342
...@@ -133,7 +133,7 @@ pushover_free_message(pushover_message_t **msg) ...@@ -133,7 +133,7 @@ pushover_free_message(pushover_message_t **msg)
msgp = *msg; msgp = *msg;
free(msgp->psh_user); free(msgp->psh_dest);
free(msgp->psh_msg); free(msgp->psh_msg);
free(msgp->psh_title); free(msgp->psh_title);
free(msgp->psh_device); free(msgp->psh_device);
...@@ -158,14 +158,14 @@ pushover_message_set_msg(pushover_message_t *msg, char *data) ...@@ -158,14 +158,14 @@ pushover_message_set_msg(pushover_message_t *msg, char *data)
EXPORTED_SYM EXPORTED_SYM
bool bool
pushover_message_set_user(pushover_message_t *msg, char *user) pushover_message_set_dest(pushover_message_t *msg, char *dest)
{ {
assert(msg != NULL); assert(msg != NULL);
assert(user != NULL); assert(dest != NULL);
msg->psh_user = strdup(user); msg->psh_dest = strdup(dest);
return (msg->psh_user != NULL); return (msg->psh_dest != NULL);
} }
EXPORTED_SYM EXPORTED_SYM
...@@ -220,7 +220,7 @@ pushover_submit_message(pushover_ctx_t *ctx, pushover_message_t *msg) ...@@ -220,7 +220,7 @@ pushover_submit_message(pushover_ctx_t *ctx, pushover_message_t *msg)
assert(ctx != NULL); assert(ctx != NULL);
assert(msg != NULL); assert(msg != NULL);
assert(ctx->psh_token != NULL); assert(ctx->psh_token != NULL);
assert(msg->psh_user != NULL); assert(msg->psh_dest != NULL);
assert(msg->psh_msg != NULL); assert(msg->psh_msg != NULL);
assert(pushover_message_priority_sane(msg->psh_priority)); assert(pushover_message_priority_sane(msg->psh_priority));
...@@ -254,7 +254,7 @@ end: ...@@ -254,7 +254,7 @@ end:
static char * static char *
msg_to_str(pushover_ctx_t *ctx, pushover_message_t *msg, CURL *curl) msg_to_str(pushover_ctx_t *ctx, pushover_message_t *msg, CURL *curl)
{ {
char *res, *t_device, *t_msg, *t_title, *t_token, *t_user; char *res, *t_device, *t_msg, *t_title, *t_token, *t_dest;
assert(ctx != NULL); assert(ctx != NULL);
assert(msg != NULL); assert(msg != NULL);
...@@ -269,14 +269,14 @@ msg_to_str(pushover_ctx_t *ctx, pushover_message_t *msg, CURL *curl) ...@@ -269,14 +269,14 @@ msg_to_str(pushover_ctx_t *ctx, pushover_message_t *msg, CURL *curl)
msg->psh_title ? msg->psh_title : "", 0); msg->psh_title ? msg->psh_title : "", 0);
t_token = curl_easy_escape(curl, t_token = curl_easy_escape(curl,
ctx->psh_token, 0); ctx->psh_token, 0);
t_user = curl_easy_escape(curl, t_dest = curl_easy_escape(curl,
msg->psh_user, 0); msg->psh_dest, 0);
if (t_device == NULL || if (t_device == NULL ||
t_msg == NULL || t_msg == NULL ||
t_title == NULL || t_title == NULL ||
t_token == NULL || t_token == NULL ||
t_user == NULL) { t_dest == NULL) {
goto end; goto end;
} }
...@@ -288,7 +288,7 @@ msg_to_str(pushover_ctx_t *ctx, pushover_message_t *msg, CURL *curl) ...@@ -288,7 +288,7 @@ msg_to_str(pushover_ctx_t *ctx, pushover_message_t *msg, CURL *curl)
"priority=%d&" "priority=%d&"
"device=%s", "device=%s",
t_token, t_token,
t_user, t_dest,
t_msg, t_msg,
t_title, t_title,
msg->psh_priority, msg->psh_priority,
...@@ -299,7 +299,7 @@ end: ...@@ -299,7 +299,7 @@ end:
curl_free(t_msg); curl_free(t_msg);
curl_free(t_title); curl_free(t_title);
curl_free(t_token); curl_free(t_token);
curl_free(t_user); curl_free(t_dest);
return (res); return (res);
} }
......
...@@ -25,7 +25,7 @@ typedef struct _pushover_ctx { ...@@ -25,7 +25,7 @@ typedef struct _pushover_ctx {
} pushover_ctx_t; } pushover_ctx_t;
typedef struct _pushover_message { typedef struct _pushover_message {
char *psh_user; char *psh_dest;
char *psh_msg; char *psh_msg;
char *psh_title; char *psh_title;
char *psh_device; char *psh_device;
...@@ -40,7 +40,7 @@ bool pushover_set_token(pushover_ctx_t *, const char *); ...@@ -40,7 +40,7 @@ bool pushover_set_token(pushover_ctx_t *, const char *);
pushover_message_t *pushover_init_message(pushover_message_t *); pushover_message_t *pushover_init_message(pushover_message_t *);
void pushover_free_message(pushover_message_t **); void pushover_free_message(pushover_message_t **);
bool pushover_message_set_msg(pushover_message_t *, char *); bool pushover_message_set_msg(pushover_message_t *, char *);
bool pushover_message_set_user(pushover_message_t *, char *); bool pushover_message_set_dest(pushover_message_t *, char *);
bool pushover_message_set_title(pushover_message_t *, char *); bool pushover_message_set_title(pushover_message_t *, char *);
bool pushover_message_set_device(pushover_message_t *, char *); bool pushover_message_set_device(pushover_message_t *, char *);
bool pushover_message_set_priority(pushover_message_t *, bool pushover_message_set_priority(pushover_message_t *,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment