/[gentoo-x86]/app-admin/elektra/files/elektra-0.8.3-fix-yajl-if-user-config.patch
Gentoo

Contents of /app-admin/elektra/files/elektra-0.8.3-fix-yajl-if-user-config.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download) (as text)
Sun Nov 4 10:40:57 2012 UTC (7 years, 4 months ago) by xmw
Branch: MAIN
CVS Tags: HEAD
File MIME type: text/x-diff
Version bump, big thanks to Andreas Sturmlechner doing all the work on bug 429722.

(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)

1 --- a/src/plugins/yajl/yajl.c
2 +++ b/src/plugins/yajl/yajl.c
3 @@ -23,6 +23,10 @@
4 ***************************************************************************/
5
6
7 +#ifndef HAVE_KDBCONFIG
8 +# include "kdbconfig.h"
9 +#endif
10 +
11 #include "yajl.h"
12
13 #include <kdberrors.h>
14 @@ -340,7 +344,7 @@
15 KeySet *config= elektraPluginGetConfig(handle);
16
17 // ksClear (returned);
18 - if (keyIsUser(parentKey))
19 + if (!strncmp(keyName(parentKey), "user", 4))
20 {
21 const Key * lookup = ksLookupByName(config, "/user_path", 0);
22 if (!lookup)
23 @@ -422,7 +426,7 @@
24 return 1; /* success */
25 }
26
27 -int elektraYajlSet(Plugin *handle, KeySet *returned, Key *parentKey)
28 +int elektraYajlSet(Plugin *handle ELEKTRA_UNUSED, KeySet *returned, Key *parentKey)
29 {
30 yajl_gen_config conf = { 1, " " };
31 yajl_gen g = yajl_gen_alloc(&conf, NULL);

  ViewVC Help
Powered by ViewVC 1.1.20