maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

GUACAMOLE-1293: Simplify the assignment of strings/constants.

Browse Source
This commit is contained in:
Virtually Nick 2022-07-25 21:29:15 -04:00
parent 26eadc37a3
commit 02b24d0101
1 changed files with 22 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/libguac/client.c
View File

@ -760,35 +760,23 @@ int guac_client_owner_supports_required(guac_client* client) {
static void* guac_client_owner_notify_join_callback(guac_user* user, void* data) { static void* guac_client_owner_notify_join_callback(guac_user* user, void* data) {
const guac_user* joiner = (const guac_user *) data; const guac_user* joiner = (const guac_user *) data;
int retval = 0;
char* owner = strdup("owner"); if (user == NULL)
if (user->info.username != NULL) { return (void*) ((intptr_t) -1);
free(owner);
owner = strdup(user->info.username);
}
char* joinName = strdup("anonymous"); char* owner = "owner";
if (joiner->info.username != NULL) { if (user->info.username != NULL)
free(joinName); owner = (char *) user->info.username;
joinName = strdup(joiner->info.username);
} char* joinName = "anonymous";
if (joiner->info.username != NULL)
joinName = (char *) joiner->info.username;
guac_user_log(user, GUAC_LOG_DEBUG, "Notifying owner %s of %s joining.", owner, joinName); guac_user_log(user, GUAC_LOG_DEBUG, "Notifying owner %s of %s joining.", owner, joinName);
/* Send required parameters to owner. */ /* Send required parameters to owner. */
if (user != NULL) {
const char* args[] = { (const char*)joinName, NULL }; const char* args[] = { (const char*)joinName, NULL };
retval = guac_protocol_send_msg(user->socket, GUAC_MSG_CLIENT_JOINED, args); return (void*) ((intptr_t) guac_protocol_send_msg(user->socket, GUAC_MSG_CLIENT_JOINED, args));
}
else
retval = -1;
free(owner);
free(joinName);
return (void*) ((intptr_t) retval);
} }
@ -824,30 +812,22 @@ static void* guac_client_owner_notify_leave_callback(guac_user* user, void* data
const guac_user* quitter = (const guac_user *) data; const guac_user* quitter = (const guac_user *) data;
char* ownerName = strdup("owner"); if (user == NULL)
if (user->info.username != NULL) { return (void*) ((intptr_t) -1);
free(ownerName);
ownerName = strdup(user->info.username);
}
char* quitterName = strdup("anonymous"); char* ownerName = "owner";
if (quitter->info.username != NULL) { if (user->info.username != NULL)
free(quitterName); ownerName = (char *) user->info.username;
quitterName = strdup(quitter->info.username);
} char* quitterName = "anonymous";
if (quitter->info.username != NULL)
quitterName = (char *) quitter->info.username;
guac_user_log(user, GUAC_LOG_DEBUG, "Notifying owner %s of %s leaving.", ownerName, quitterName); guac_user_log(user, GUAC_LOG_DEBUG, "Notifying owner %s of %s leaving.", ownerName, quitterName);
/* Send required parameters to owner. */ /* Send required parameters to owner. */
if (user != NULL) {
const char* args[] = { (const char*)quitterName, NULL }; const char* args[] = { (const char*)quitterName, NULL };
return (void*) ((intptr_t) guac_protocol_send_msg(user->socket, GUAC_MSG_CLIENT_LEFT, args)); return (void*) ((intptr_t) guac_protocol_send_msg(user->socket, GUAC_MSG_CLIENT_LEFT, args));
}
free(ownerName);
free(quitterName);
return (void*) ((intptr_t) -1);
} }