diff options
| author | Peter Meerwald <p.meerwald@bct-electronic.com> | 2014-08-18 14:04:59 +0200 |
|---|---|---|
| committer | Peter Meerwald <p.meerwald@bct-electronic.com> | 2014-08-22 15:35:33 +0200 |
| commit | a9408772244f6e04c80aedbcbcbbe0a1c1522726 (patch) | |
| tree | d7ee4e016594402171adbeb127f30f74b36b0a35 | |
| parent | 514766a79f9a141951cfc359baa2b44ca9e0e779 (diff) | |
format: Use json_object_object_get_ex() instead of deprecated json_object_object_get()
pulse/format.c: In function 'pa_format_info_get_prop_type':
pulse/format.c:252:5: warning: implicit declaration of function 'is_error' [-Wimplicit-function-declaration]
pulse/format.c:287:13: warning: 'json_object_object_get' is deprecated (declared at /usr/local/include/json-c/json_object.h:290) [-Wdeprecated-declarations]
pulse/format.c:293:13: warning: 'json_object_object_get' is deprecated (declared at /usr/local/include/json-c/json_object.h:290) [-Wdeprecated-declarations]
pulse/format.c: In function 'pa_format_info_get_prop_int_range':
pulse/format.c:364:5: warning: 'json_object_object_get' is deprecated (declared at /usr/local/include/json-c/json_object.h:290) [-Wdeprecated-declarations]
pulse/format.c:369:5: warning: 'json_object_object_get' is deprecated (declared at /usr/local/include/json-c/json_object.h:290) [-Wdeprecated-declarations]
pulse/format.c: In function 'pa_format_info_prop_compatible':
pulse/format.c:676:9: warning: 'json_object_object_get' is deprecated (declared at /usr/local/include/json-c/json_object.h:290) [-Wdeprecated-declarations]
pulse/format.c:680:9: warning: 'json_object_object_get' is deprecated (declared at /usr/local/include/json-c/json_object.h:290) [-Wdeprecated-declarations]
json-c 0.10 (released 20120530) added json_object_object_get_ex()
json-c 0.12 (released 20140410) deprecated json_object_object_get()
PulseAudio depends on json 0.9 or json-c 0.11, drop support for json 0.9
in a subsequent patch and require json-c 0.11 (this will also avoids confusion
which json package is needed due to the upstream rename)
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
| -rw-r--r-- | src/pulse/format.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/pulse/format.c b/src/pulse/format.c index b1276c79b..28349659f 100644 --- a/src/pulse/format.c +++ b/src/pulse/format.c @@ -283,14 +283,12 @@ pa_prop_type_t pa_format_info_get_prop_type(const pa_format_info *f, const char case json_type_object: /* We actually know at this point that it's a int range, but let's * confirm. */ - o1 = json_object_object_get(o, PA_JSON_MIN_KEY); - if (!o1) { + if (!json_object_object_get_ex(o, PA_JSON_MIN_KEY, NULL)) { type = PA_PROP_TYPE_INVALID; break; } - o1 = json_object_object_get(o, PA_JSON_MAX_KEY); - if (!o1) { + if (!json_object_object_get_ex(o, PA_JSON_MAX_KEY, NULL)) { type = PA_PROP_TYPE_INVALID; break; } @@ -360,12 +358,12 @@ int pa_format_info_get_prop_int_range(const pa_format_info *f, const char *key, if (json_object_get_type(o) != json_type_object) goto out; - if (!(o1 = json_object_object_get(o, PA_JSON_MIN_KEY))) + if (!json_object_object_get_ex(o, PA_JSON_MIN_KEY, &o1)) goto out; *min = json_object_get_int(o1); - if (!(o1 = json_object_object_get(o, PA_JSON_MAX_KEY))) + if (!json_object_object_get_ex(o, PA_JSON_MAX_KEY, &o1)) goto out; *max = json_object_get_int(o1); @@ -668,12 +666,12 @@ static int pa_format_info_prop_compatible(const char *one, const char *two) { goto out; } - o_min = json_object_object_get(o1, PA_JSON_MIN_KEY); - if (!o_min || json_object_get_type(o_min) != json_type_int) + if (!json_object_object_get_ex(o1, PA_JSON_MIN_KEY, &o_min) || + json_object_get_type(o_min) != json_type_int) goto out; - o_max = json_object_object_get(o1, PA_JSON_MAX_KEY); - if (!o_max || json_object_get_type(o_max) != json_type_int) + if (!json_object_object_get_ex(o1, PA_JSON_MAX_KEY, &o_max) || + json_object_get_type(o_max) != json_type_int) goto out; v = json_object_get_int(o2); |