Patrick Williams | ddad1a1 | 2017-02-23 20:36:32 -0600 | [diff] [blame] | 1 | From ad1be542b87b3186f8ef7bee2c594daefe5bb4c8 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Tue, 18 Oct 2016 21:31:40 +0000 |
| 4 | Subject: [PATCH] Fix warnings found with clang |
| 5 | |
| 6 | | /mnt/oe/openembedded-core/build/workspace/sources/libplist/src/base64.c:107:12: error: non-void function 'base64decode' should return a value [-Wreturn-type] |
| 7 | | if (!buf) return; |
| 8 | | ^ |
| 9 | | /mnt/oe/openembedded-core/build/workspace/sources/libplist/src/base64.c:109:16: error: non-void function 'base64decode' should return a value [-Wreturn-type] |
| 10 | | if (len <= 0) return; |
| 11 | |
| 12 | Upstream-Status: Pending |
| 13 | |
| 14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 15 | --- |
| 16 | libcnary/node.c | 2 +- |
| 17 | src/base64.c | 4 ++-- |
| 18 | 2 files changed, 3 insertions(+), 3 deletions(-) |
| 19 | |
| 20 | diff --git a/libcnary/node.c b/libcnary/node.c |
| 21 | index 1f9f669..d6f3f63 100644 |
| 22 | --- a/libcnary/node.c |
| 23 | +++ b/libcnary/node.c |
| 24 | @@ -104,7 +104,7 @@ int node_detach(node_t* parent, node_t* child) { |
| 25 | |
| 26 | int node_insert(node_t* parent, unsigned int index, node_t* child) |
| 27 | { |
| 28 | - if (!parent || !child) return; |
| 29 | + if (!parent || !child) return -1; |
| 30 | child->isLeaf = TRUE; |
| 31 | child->isRoot = FALSE; |
| 32 | child->parent = parent; |
| 33 | diff --git a/src/base64.c b/src/base64.c |
| 34 | index 65c6061..531a06a 100644 |
| 35 | --- a/src/base64.c |
| 36 | +++ b/src/base64.c |
| 37 | @@ -104,9 +104,9 @@ static int base64decode_block(unsigned char *target, const char *data, size_t da |
| 38 | |
| 39 | unsigned char *base64decode(const char *buf, size_t *size) |
| 40 | { |
| 41 | - if (!buf) return; |
| 42 | + if (!buf) return 0; |
| 43 | size_t len = strlen(buf); |
| 44 | - if (len <= 0) return; |
| 45 | + if (len <= 0) return 0; |
| 46 | unsigned char *outbuf = (unsigned char*)malloc((len/4)*3+3); |
| 47 | |
| 48 | unsigned char *line; |
| 49 | -- |
| 50 | 1.9.1 |
| 51 | |