projects
/
platform
/
core
/
system
/
faultd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4e6e63f
)
Fix variable shadowing
60/151060/2
author
Michal Bloch
<m.bloch@samsung.com>
Tue, 19 Sep 2017 13:20:54 +0000
(15:20 +0200)
committer
Michal Bloch
<m.bloch@samsung.com>
Mon, 25 Sep 2017 12:12:26 +0000
(14:12 +0200)
Change-Id: I523a9b271091fc2e59e04c8fe3c71e00a0dac22c
Signed-off-by: Michal Bloch <m.bloch@samsung.com>
src/database/ejdb.c
patch
|
blob
|
history
diff --git
a/src/database/ejdb.c
b/src/database/ejdb.c
index 4242f7791e179d32639a033d499f6805f2647ef4..cdff9ac357bb795b86030b3886226403501939d3 100644
(file)
--- a/
src/database/ejdb.c
+++ b/
src/database/ejdb.c
@@
-210,11
+210,11
@@
static int bson_to_faultd_object(bson *b, struct faultd_object *out)
case BSON_OBJECT:
{
struct timespec ts;
- bson b;
+ bson b
s
;
- bson_iterator_subobject(&it, &b);
+ bson_iterator_subobject(&it, &b
s
);
- if (bson_to_timespec(&b, &ts) == 0) {
+ if (bson_to_timespec(&b
s
, &ts) == 0) {
ret = faultd_object_append_timespec(out, key, &ts);
} else {
struct faultd_object *child;
@@
-223,7
+223,7
@@
static int bson_to_faultd_object(bson *b, struct faultd_object *out)
if (ret != 0)
break;
- ret = bson_to_faultd_object(&b, child);
+ ret = bson_to_faultd_object(&b
s
, child);
if (ret != 0)
goto cleanup;