Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Extract function "copy_plist_item" #124

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Extract function "copy_plist_item" #124

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 12 additions & 20 deletions src/client.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,30 +628,22 @@ static char* plist_dict_get_string_val(plist_t dict, const char* key)
return str;
}

static void update_client_info(struct mux_client *client, plist_t dict)
static void copy_plist_item(const char* key, plist_type type, plist_t src, plist_t dest)
{
plist_t node = NULL;
plist_t info = plist_new_dict();

node = plist_dict_get_item(dict, "BundleID");
if (node && (plist_get_node_type(node) == PLIST_STRING)) {
plist_dict_set_item(info, "BundleID", plist_copy(node));
}

node = plist_dict_get_item(dict, "ClientVersionString");
if (node && (plist_get_node_type(node) == PLIST_STRING)) {
plist_dict_set_item(info, "ClientVersionString", plist_copy(node));
plist_t item = plist_dict_get_item(src, key);
if (item && (plist_get_node_type(item) == type)) {
plist_dict_set_item(dest, key, plist_copy(item));
}
}

node = plist_dict_get_item(dict, "ProgName");
if (node && (plist_get_node_type(node) == PLIST_STRING)) {
plist_dict_set_item(info, "ProgName", plist_copy(node));
}
static void update_client_info(struct mux_client *client, plist_t dict)
{
plist_t info = plist_new_dict();

node = plist_dict_get_item(dict, "kLibUSBMuxVersion");
if (node && (plist_get_node_type(node) == PLIST_UINT)) {
plist_dict_set_item(info, "kLibUSBMuxVersion", plist_copy(node));
}
copy_plist_item("BundleID", PLIST_STRING, dict, info);
copy_plist_item("ClientVersionString", PLIST_STRING, dict, info);
copy_plist_item("ProgName", PLIST_STRING, dict, info);
copy_plist_item("kLibUSBMuxVersion", PLIST_UINT, dict, info);
plist_free(client->info);
client->info = info;
}
Expand Down