1.1 --- a/configure.ac Sat Aug 23 16:07:09 2014 +0100
1.2 +++ b/configure.ac Sat Aug 23 16:28:31 2014 +0100
1.3 @@ -118,7 +118,7 @@
1.4 changequote(,)dnl
1.5 case " $CFLAGS " in
1.6 *[\ \ ]-Wall[\ \ ]*) ;;
1.7 - *) CFLAGS="$CFLAGS -Wall" ;;
1.8 + *) CFLAGS="$CFLAGS -Wall -Wno-parentheses" ;;
1.9 esac
1.10
1.11 case " $CFLAGS " in
2.1 --- a/librazor/error.c Sat Aug 23 16:07:09 2014 +0100
2.2 +++ b/librazor/error.c Sat Aug 23 16:28:31 2014 +0100
2.3 @@ -27,7 +27,7 @@
2.4 #include "razor.h"
2.5 #include "razor-internal.h"
2.6
2.7 -const char *razor_error_get_path_str(struct razor_error *error)
2.8 +static const char *razor_error_get_path_str(struct razor_error *error)
2.9 {
2.10 if (error->path_str)
2.11 return error->path_str;
3.1 --- a/librazor/importer.c Sat Aug 23 16:07:09 2014 +0100
3.2 +++ b/librazor/importer.c Sat Aug 23 16:28:31 2014 +0100
3.3 @@ -434,7 +434,7 @@
3.4 struct import_entry *filenames;
3.5 char *f, *end;
3.6 uint32_t name, *r, s;
3.7 - char rootname[256], dirname[256];
3.8 + char dirname[256];
3.9 struct import_directory *d, *last_root;
3.10 struct array roots;
3.11 struct razor_entry *e;
4.1 --- a/librazor/iterator.c Sat Aug 23 16:07:09 2014 +0100
4.2 +++ b/librazor/iterator.c Sat Aug 23 16:28:31 2014 +0100
4.3 @@ -24,6 +24,7 @@
4.4 #include <stdarg.h>
4.5 #include <string.h>
4.6 #include <assert.h>
4.7 +#include <stdio.h>
4.8
4.9 #include "razor-internal.h"
4.10 #include "razor.h"
5.1 --- a/librazor/lua.c Sat Aug 23 16:07:09 2014 +0100
5.2 +++ b/librazor/lua.c Sat Aug 23 16:28:31 2014 +0100
5.3 @@ -323,13 +323,13 @@
5.4 end = razor_preload.loaders.data + razor_preload.loaders.size;
5.5 for(ploader = razor_preload.loaders.data; ploader < end; ploader++)
5.6 if (ploader->name == name) {
5.7 - ploader->func = loader;
5.8 + ploader->func = (lua_CFunction)loader;
5.9 return;
5.10 }
5.11
5.12 ploader = array_add(&razor_preload.loaders, sizeof(*ploader));
5.13 ploader->name = name;
5.14 - ploader->func = loader;
5.15 + ploader->func = (lua_CFunction)loader;
5.16 }
5.17
5.18 RAZOR_EXPORT void (*razor_get_lua_loader(const char *modname))()
5.19 @@ -345,7 +345,7 @@
5.20 end = razor_preload.loaders.data + razor_preload.loaders.size;
5.21 for(ploader = razor_preload.loaders.data; ploader < end; ploader++)
5.22 if (ploader->name == name)
5.23 - return ploader->func;
5.24 + return (void (*)())ploader->func;
5.25
5.26 return 0;
5.27 }
6.1 --- a/librazor/razor.c Sat Aug 23 16:07:09 2014 +0100
6.2 +++ b/librazor/razor.c Sat Aug 23 16:28:31 2014 +0100
6.3 @@ -1225,7 +1225,7 @@
6.4 {
6.5 struct razor_merger *merger;
6.6 struct razor_set *set;
6.7 - struct razor_package *n, *nend, *npkgs, *s, *send, *spkgs;
6.8 + struct razor_package *n, *nend, *s, *send;
6.9 struct deque *done;
6.10 size_t pos;
6.11 char *npool, *spool;
6.12 @@ -1237,12 +1237,10 @@
6.13 deque_shift(done);
6.14
6.15 s = ii->set->packages.data;
6.16 - spkgs = ii->set->packages.data;
6.17 send = ii->set->packages.data + ii->set->packages.size;
6.18 spool = ii->set->string_pool.data;
6.19
6.20 n = ii->next->packages.data;
6.21 - npkgs = ii->next->packages.data;
6.22 nend = ii->next->packages.data + ii->next->packages.size;
6.23 npool = ii->next->string_pool.data;
6.24
7.1 --- a/librazor/rpm.c Sat Aug 23 16:07:09 2014 +0100
7.2 +++ b/librazor/rpm.c Sat Aug 23 16:28:31 2014 +0100
7.3 @@ -1077,7 +1077,7 @@
7.4 err = inflateInit2(&installer->stream, -MAX_WBITS);
7.5 if (err != Z_OK) {
7.6 sprintf(buffer, "%d", err);
7.7 - s = razor_concat("inflateEnd error: ", s, NULL);
7.8 + s = razor_concat("inflateEnd error: ", buffer, NULL);
7.9 razor_atomic_abort(installer->atomic, s);
7.10 free(s);
7.11 return -1;
7.12 @@ -1096,7 +1096,7 @@
7.13
7.14 if (err != Z_OK) {
7.15 sprintf(buffer, "%d", err);
7.16 - s = razor_concat("inflateEnd error: ", s, NULL);
7.17 + s = razor_concat("inflateEnd error: ", buffer, NULL);
7.18 razor_atomic_abort(installer->atomic, s);
7.19 free(s);
7.20 }
8.1 --- a/librazor/transaction.c Sat Aug 23 16:07:09 2014 +0100
8.2 +++ b/librazor/transaction.c Sat Aug 23 16:28:31 2014 +0100
8.3 @@ -293,7 +293,7 @@
8.4 const char *version)
8.5 {
8.6 struct razor_property *p;
8.7 - struct razor_package *pkg, *pkgs;
8.8 + struct razor_package *pkg;
8.9 struct razor_package_iterator pkg_iter;
8.10 struct razor_set *set;
8.11 const char *n, *v;
8.12 @@ -304,7 +304,6 @@
8.13 else
8.14 set = trans->upstream.set;
8.15
8.16 - pkgs = (struct razor_package *) set->packages.data;
8.17 type = ppi->p->flags & RAZOR_PROPERTY_TYPE_MASK;
8.18 for (p = ppi->p;
8.19 p < ppi->end &&
8.20 @@ -425,10 +424,8 @@
8.21 remove_obsoleted_packages(struct razor_transaction *trans)
8.22 {
8.23 struct razor_property *up;
8.24 - struct razor_package *spkgs;
8.25 struct prop_iter spi, upi;
8.26
8.27 - spkgs = trans->system.set->packages.data;
8.28 prop_iter_init(&spi, &trans->system);
8.29 prop_iter_init(&upi, &trans->upstream);
8.30
9.1 --- a/librazor/util.c Sat Aug 23 16:07:09 2014 +0100
9.2 +++ b/librazor/util.c Sat Aug 23 16:28:31 2014 +0100
9.3 @@ -244,7 +244,10 @@
9.4 void environment_set(struct environment *env)
9.5 {
9.6 int i, count;
9.7 - char *s, *t;
9.8 + char *s;
9.9 +#ifndef WIN32
9.10 + char *t;
9.11 +#endif
9.12 uint32_t *r;
9.13
9.14 if (!env->is_set) {
10.1 --- a/src/import-yum.c Sat Aug 23 16:07:09 2014 +0100
10.2 +++ b/src/import-yum.c Sat Aug 23 16:28:31 2014 +0100
10.3 @@ -287,7 +287,7 @@
10.4 {
10.5 struct yum_context ctx={0};
10.6 void *buf;
10.7 - int len, ret;
10.8 + int len;
10.9 gzFile primary, filelists;
10.10 XML_ParsingStatus status;
10.11
10.12 @@ -325,7 +325,7 @@
10.13 XML_GetParsingStatus(ctx.current_parser, &status);
10.14 switch (status.parsing) {
10.15 case XML_SUSPENDED:
10.16 - ret = XML_ResumeParser(ctx.current_parser);
10.17 + XML_ResumeParser(ctx.current_parser);
10.18 break;
10.19 case XML_PARSING:
10.20 case XML_INITIALIZED:
11.1 --- a/src/main.c Sat Aug 23 16:07:09 2014 +0100
11.2 +++ b/src/main.c Sat Aug 23 16:28:31 2014 +0100
11.3 @@ -411,6 +411,7 @@
11.4 RAZOR_PROPERTY_PROVIDES);
11.5 }
11.6
11.7 +#ifdef HAVE_CURL
11.8 static int
11.9 show_progress(void *clientp,
11.10 double dltotal, double dlnow, double ultotal, double ulnow)
11.11 @@ -423,6 +424,7 @@
11.12
11.13 return 0;
11.14 }
11.15 +#endif /* HAVE_CURL */
11.16
11.17 static int
11.18 download_if_missing(const char *url, const char *file)