diff options
| author | 2014-03-24 16:49:33 +0100 | |
|---|---|---|
| committer | 2014-03-24 16:49:33 +0100 | |
| commit | 16428372666a32f7493b7b4f949d6ed5c37118ef (patch) | |
| tree | 84316860937f623e43e4126924dfd92631e033c1 | |
| parent | 13b7851cc3b21cfb9cd06bbd9174a10b68106669 (diff) | |
| download | usbmuxd-16428372666a32f7493b7b4f949d6ed5c37118ef.tar.gz usbmuxd-16428372666a32f7493b7b4f949d6ed5c37118ef.tar.bz2 | |
Use plist_dict_set_item() instead of deprecated plist_dict_insert_item()
| -rw-r--r-- | src/client.c | 32 | ||||
| -rw-r--r-- | src/conf.c | 4 |
2 files changed, 18 insertions, 18 deletions
diff --git a/src/client.c b/src/client.c index 330a902..1e15a1e 100644 --- a/src/client.c +++ b/src/client.c | |||
| @@ -216,8 +216,8 @@ static int send_result(struct mux_client *client, uint32_t tag, uint32_t result) | |||
| 216 | if (client->proto_version == 1) { | 216 | if (client->proto_version == 1) { |
| 217 | /* XML plist packet */ | 217 | /* XML plist packet */ |
| 218 | plist_t dict = plist_new_dict(); | 218 | plist_t dict = plist_new_dict(); |
| 219 | plist_dict_insert_item(dict, "MessageType", plist_new_string("Result")); | 219 | plist_dict_set_item(dict, "MessageType", plist_new_string("Result")); |
| 220 | plist_dict_insert_item(dict, "Number", plist_new_uint(result)); | 220 | plist_dict_set_item(dict, "Number", plist_new_uint(result)); |
| 221 | res = send_plist_pkt(client, tag, dict); | 221 | res = send_plist_pkt(client, tag, dict); |
| 222 | plist_free(dict); | 222 | plist_free(dict); |
| 223 | } else { | 223 | } else { |
| @@ -253,17 +253,17 @@ int client_notify_connect(struct mux_client *client, enum usbmuxd_result result) | |||
| 253 | static plist_t create_device_attached_plist(struct device_info *dev) | 253 | static plist_t create_device_attached_plist(struct device_info *dev) |
| 254 | { | 254 | { |
| 255 | plist_t dict = plist_new_dict(); | 255 | plist_t dict = plist_new_dict(); |
| 256 | plist_dict_insert_item(dict, "MessageType", plist_new_string("Attached")); | 256 | plist_dict_set_item(dict, "MessageType", plist_new_string("Attached")); |
| 257 | plist_dict_insert_item(dict, "DeviceID", plist_new_uint(dev->id)); | 257 | plist_dict_set_item(dict, "DeviceID", plist_new_uint(dev->id)); |
| 258 | plist_t props = plist_new_dict(); | 258 | plist_t props = plist_new_dict(); |
| 259 | // TODO: get current usb speed | 259 | // TODO: get current usb speed |
| 260 | plist_dict_insert_item(props, "ConnectionSpeed", plist_new_uint(480000000)); | 260 | plist_dict_set_item(props, "ConnectionSpeed", plist_new_uint(480000000)); |
| 261 | plist_dict_insert_item(props, "ConnectionType", plist_new_string("USB")); | 261 | plist_dict_set_item(props, "ConnectionType", plist_new_string("USB")); |
| 262 | plist_dict_insert_item(props, "DeviceID", plist_new_uint(dev->id)); | 262 | plist_dict_set_item(props, "DeviceID", plist_new_uint(dev->id)); |
| 263 | plist_dict_insert_item(props, "LocationID", plist_new_uint(dev->location)); | 263 | plist_dict_set_item(props, "LocationID", plist_new_uint(dev->location)); |
| 264 | plist_dict_insert_item(props, "ProductID", plist_new_uint(dev->pid)); | 264 | plist_dict_set_item(props, "ProductID", plist_new_uint(dev->pid)); |
| 265 | plist_dict_insert_item(props, "SerialNumber", plist_new_string(dev->serial)); | 265 | plist_dict_set_item(props, "SerialNumber", plist_new_string(dev->serial)); |
| 266 | plist_dict_insert_item(dict, "Properties", props); | 266 | plist_dict_set_item(dict, "Properties", props); |
| 267 | return dict; | 267 | return dict; |
| 268 | } | 268 | } |
| 269 | 269 | ||
| @@ -288,7 +288,7 @@ static int send_device_list(struct mux_client *client, uint32_t tag) | |||
| 288 | if (devs) | 288 | if (devs) |
| 289 | free(devs); | 289 | free(devs); |
| 290 | 290 | ||
| 291 | plist_dict_insert_item(dict, "DeviceList", devices); | 291 | plist_dict_set_item(dict, "DeviceList", devices); |
| 292 | res = send_plist_pkt(client, tag, dict); | 292 | res = send_plist_pkt(client, tag, dict); |
| 293 | plist_free(dict); | 293 | plist_free(dict); |
| 294 | return res; | 294 | return res; |
| @@ -302,7 +302,7 @@ static int send_system_buid(struct mux_client *client, uint32_t tag) | |||
| 302 | config_get_system_buid(&buid); | 302 | config_get_system_buid(&buid); |
| 303 | 303 | ||
| 304 | plist_t dict = plist_new_dict(); | 304 | plist_t dict = plist_new_dict(); |
| 305 | plist_dict_insert_item(dict, "BUID", plist_new_string(buid)); | 305 | plist_dict_set_item(dict, "BUID", plist_new_string(buid)); |
| 306 | res = send_plist_pkt(client, tag, dict); | 306 | res = send_plist_pkt(client, tag, dict); |
| 307 | plist_free(dict); | 307 | plist_free(dict); |
| 308 | return res; | 308 | return res; |
| @@ -322,7 +322,7 @@ static int send_pair_record(struct mux_client *client, uint32_t tag, const char* | |||
| 322 | 322 | ||
| 323 | if (record_data) { | 323 | if (record_data) { |
| 324 | plist_t dict = plist_new_dict(); | 324 | plist_t dict = plist_new_dict(); |
| 325 | plist_dict_insert_item(dict, "PairRecordData", plist_new_data(record_data, record_size)); | 325 | plist_dict_set_item(dict, "PairRecordData", plist_new_data(record_data, record_size)); |
| 326 | free(record_data); | 326 | free(record_data); |
| 327 | res = send_plist_pkt(client, tag, dict); | 327 | res = send_plist_pkt(client, tag, dict); |
| 328 | plist_free(dict); | 328 | plist_free(dict); |
| @@ -360,8 +360,8 @@ static int notify_device_remove(struct mux_client *client, uint32_t device_id) | |||
| 360 | if (client->proto_version == 1) { | 360 | if (client->proto_version == 1) { |
| 361 | /* XML plist packet */ | 361 | /* XML plist packet */ |
| 362 | plist_t dict = plist_new_dict(); | 362 | plist_t dict = plist_new_dict(); |
| 363 | plist_dict_insert_item(dict, "MessageType", plist_new_string("Detached")); | 363 | plist_dict_set_item(dict, "MessageType", plist_new_string("Detached")); |
| 364 | plist_dict_insert_item(dict, "DeviceID", plist_new_uint(device_id)); | 364 | plist_dict_set_item(dict, "DeviceID", plist_new_uint(device_id)); |
| 365 | res = send_plist_pkt(client, 0, dict); | 365 | res = send_plist_pkt(client, 0, dict); |
| 366 | plist_free(dict); | 366 | plist_free(dict); |
| 367 | } else { | 367 | } else { |
| @@ -234,13 +234,13 @@ static int internal_set_value(const char *config_file, const char *key, plist_t | |||
| 234 | plist_read_from_filename(&config, config_file); | 234 | plist_read_from_filename(&config, config_file); |
| 235 | if (!config) { | 235 | if (!config) { |
| 236 | config = plist_new_dict(); | 236 | config = plist_new_dict(); |
| 237 | plist_dict_insert_item(config, key, value); | 237 | plist_dict_set_item(config, key, value); |
| 238 | } else { | 238 | } else { |
| 239 | plist_t n = plist_dict_get_item(config, key); | 239 | plist_t n = plist_dict_get_item(config, key); |
| 240 | if (n) { | 240 | if (n) { |
| 241 | plist_dict_remove_item(config, key); | 241 | plist_dict_remove_item(config, key); |
| 242 | } | 242 | } |
| 243 | plist_dict_insert_item(config, key, value); | 243 | plist_dict_set_item(config, key, value); |
| 244 | remove(config_file); | 244 | remove(config_file); |
| 245 | } | 245 | } |
| 246 | 246 | ||
