diff options
| author | Ankit Vani <a@nevitus.org> | 2014-05-20 10:36:58 +0530 |
|---|---|---|
| committer | Ankit Vani <a@nevitus.org> | 2014-05-20 10:36:58 +0530 |
| commit | f2a0c1c4bff77f5ef1fd2a9c0c8d287f19b78c6b (patch) | |
| tree | 84188e69c677093254e4f45c3550ce6bb08c70a7 /libpurple/prefs.c | |
| parent | a86f54176f3e3c8affac0f6265c3caf8a1bd4153 (diff) | |
| parent | 7ac6d2be2a78f658560651f8c0035d0a80905313 (diff) | |
| download | pidgin-f2a0c1c4bff77f5ef1fd2a9c0c8d287f19b78c6b.tar.gz | |
Merged default branch
Diffstat (limited to 'libpurple/prefs.c')
| -rw-r--r-- | libpurple/prefs.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libpurple/prefs.c b/libpurple/prefs.c index d9c4aebc5c..e1be5a113f 100644 --- a/libpurple/prefs.c +++ b/libpurple/prefs.c @@ -396,8 +396,11 @@ purple_prefs_load() error = NULL; +#ifndef __COVERITY__ + /* coverity dead_error_line false positive */ if (sysconfdir == NULL) sysconfdir = ""; +#endif filename = g_build_filename(sysconfdir, "purple", "prefs.xml", NULL); purple_debug_info("prefs", "Reading %s\n", filename); @@ -567,8 +570,7 @@ add_pref(PurplePrefType type, const char *name) parent = find_pref_parent(name); - if(!parent) - return NULL; + g_return_val_if_fail(parent, NULL); my_name = get_path_basename(name); |