Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/rpm-software-management/createrepo_c.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Mlcoch <tmlcoch@redhat.com>2014-05-14 17:08:09 +0400
committerTomas Mlcoch <tmlcoch@redhat.com>2014-05-14 17:08:09 +0400
commit73f79160d7b1b2c3bf71cbf33bb40a2302af4087 (patch)
tree12482a63cc014b1f77fb96370cb683f535c25808
parentc60c7eb80c695a4f1cd81e752c55ff0401fe64f2 (diff)
Fix few compiler warnings
-rw-r--r--src/load_metadata.c4
-rw-r--r--src/misc.c2
-rw-r--r--src/parsepkg.c2
-rw-r--r--src/sqlite.c15
4 files changed, 13 insertions, 10 deletions
diff --git a/src/load_metadata.c b/src/load_metadata.c
index e37f9ec..cd2d24a 100644
--- a/src/load_metadata.c
+++ b/src/load_metadata.c
@@ -499,8 +499,8 @@ cr_metadata_load_xml(cr_Metadata *md,
// So there is guaranted that each loaded package has different
// checksum then another one.
g_debug("%s: Key \"%s\" is present multiple times. Ignoring "
- "all occurrences.", __func__, new_key);
- g_hash_table_insert(ignored_keys, g_strdup(new_key), NULL);
+ "all occurrences.", __func__, (gchar *) new_key);
+ g_hash_table_insert(ignored_keys, g_strdup((gchar *) new_key), NULL);
}
// Remove the package from the iterator anyway
g_hash_table_iter_remove(&iter);
diff --git a/src/misc.c b/src/misc.c
index dd7780f..61065e4 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -600,7 +600,7 @@ cr_decompress_file_with_stat(const char *src,
goto compress_file_cleanup;
}
- if (fwrite(buf, 1, readed, new) != readed) {
+ if (fwrite(buf, 1, readed, new) != (size_t) readed) {
g_debug("%s: Error while copy %s -> %s (%s)",
__func__, src, dst, strerror(errno));
g_set_error(err, CR_MISC_ERROR, CRE_IO,
diff --git a/src/parsepkg.c b/src/parsepkg.c
index c82d245..f31efc9 100644
--- a/src/parsepkg.c
+++ b/src/parsepkg.c
@@ -50,6 +50,7 @@ cr_package_parser_init_once_cb(gpointer user_data G_GNUC_UNUSED)
vsflags |= _RPMVSF_NOSIGNATURES;
vsflags |= RPMVSF_NOHDRCHK;
rpmtsSetVSFlags(cr_ts, vsflags);
+ return NULL;
}
void
@@ -69,6 +70,7 @@ cr_package_parser_cleanup_once_cb(gpointer user_data G_GNUC_UNUSED)
rpmFreeMacros(NULL);
rpmFreeRpmrc();
+ return NULL;
}
void
diff --git a/src/sqlite.c b/src/sqlite.c
index b554c9f..d866930 100644
--- a/src/sqlite.c
+++ b/src/sqlite.c
@@ -67,21 +67,22 @@ static inline int cr_sqlite3_bind_text(sqlite3_stmt *stmt, int i,
{
int ret;
int free_content = 0;
- char *content;
+ unsigned char *content;
if (!orig_content) {
- content = (char *) orig_content;
- } else if (xmlCheckUTF8(orig_content) && !hascontrollchars(orig_content)) {
- content = (char *) orig_content;
+ content = (unsigned char *) orig_content;
+ } else if (xmlCheckUTF8((const unsigned char *) orig_content)
+ && !hascontrollchars((const unsigned char *) orig_content)) {
+ content = (unsigned char *) orig_content;
} else {
desctructor = SQLITE_TRANSIENT;
size_t llen = strlen((const char *) orig_content);
- content = malloc(sizeof(char)*llen*2 + 1);
- cr_latin1_to_utf8(orig_content, content);
+ content = malloc(sizeof(unsigned char)*llen*2 + 1);
+ cr_latin1_to_utf8((const unsigned char *) orig_content, content);
free_content = 1;
}
- ret = sqlite3_bind_text(stmt, i, content, len, desctructor);
+ ret = sqlite3_bind_text(stmt, i, (char *) content, len, desctructor);
if (free_content)
free(content);