From fe884ef58959412972a5a84231d1ee06f34a80be Mon Sep 17 00:00:00 2001 From: Cyrille Bagard Date: Mon, 5 Sep 2016 21:05:54 +0200 Subject: Fixed a bug by transfering variable argument lists properly. --- ChangeLog | 10 ++++++++++ src/analysis/db/collection-int.h | 2 +- src/analysis/db/collection.c | 2 +- src/analysis/db/items/bookmark.c | 5 +++-- src/analysis/db/items/comment.c | 4 ++-- src/analysis/db/items/move.c | 4 ++-- src/analysis/db/items/switcher.c | 4 ++-- 7 files changed, 21 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 76c0878..e693c8d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +16-09-05 Cyrille Bagard + + * src/analysis/db/collection-int.h: + * src/analysis/db/collection.c: + * src/analysis/db/items/bookmark.c: + * src/analysis/db/items/comment.c: + * src/analysis/db/items/move.c: + * src/analysis/db/items/switcher.c: + Fix a bug by transfering variable argument lists properly. + 16-08-28 Cyrille Bagard * src/arch/arm/v7/Makefile.am: diff --git a/src/analysis/db/collection-int.h b/src/analysis/db/collection-int.h index 0b326a9..3bcf54b 100644 --- a/src/analysis/db/collection-int.h +++ b/src/analysis/db/collection-int.h @@ -42,7 +42,7 @@ typedef bool (* collec_setup_load_fc) (GDbCollection *, bound_value **, size_t * typedef bool (* collec_load_item) (GDbCollection *, const bound_value *, size_t); /* Détermine si un élément est déjà présent ou non. */ -typedef GDbItem * (* collec_has_key_fc) (GDbCollection *, va_list *); +typedef GDbItem * (* collec_has_key_fc) (GDbCollection *, va_list); diff --git a/src/analysis/db/collection.c b/src/analysis/db/collection.c index 09d9c90..afb5b28 100644 --- a/src/analysis/db/collection.c +++ b/src/analysis/db/collection.c @@ -527,7 +527,7 @@ GDbItem *g_db_collection_has_key(GDbCollection *collec, ...) va_start(ap, collec); - result = G_DB_COLLECTION_GET_CLASS(collec)->has_key(collec, &ap); + result = G_DB_COLLECTION_GET_CLASS(collec)->has_key(collec, ap); va_end(ap); diff --git a/src/analysis/db/items/bookmark.c b/src/analysis/db/items/bookmark.c index be75d0f..747053c 100644 --- a/src/analysis/db/items/bookmark.c +++ b/src/analysis/db/items/bookmark.c @@ -24,6 +24,7 @@ #include "bookmark.h" +#include #include #include @@ -137,7 +138,7 @@ static bool g_bookmark_collection_create_db_table(const GBookmarkCollection *, s static bool g_bookmark_collection_setup_load(GBookmarkCollection *, bound_value **, size_t *); /* Détermine si un élément est déjà présent ou non. */ -static GDbItem *g_bookmark_collection_has_key(GBookmarkCollection *, va_list *); +static GDbItem *g_bookmark_collection_has_key(GBookmarkCollection *, va_list); @@ -814,7 +815,7 @@ static bool g_bookmark_collection_setup_load(GBookmarkCollection *collec, bound_ * * ******************************************************************************/ -static GDbItem *g_bookmark_collection_has_key(GBookmarkCollection *collec, va_list *ap) +static GDbItem *g_bookmark_collection_has_key(GBookmarkCollection *collec, va_list ap) { GDbItem *result; /* Bilan à retourner */ vmpa2t *ref; /* Adresse de référence */ diff --git a/src/analysis/db/items/comment.c b/src/analysis/db/items/comment.c index 8b9c25f..f601bd6 100644 --- a/src/analysis/db/items/comment.c +++ b/src/analysis/db/items/comment.c @@ -151,7 +151,7 @@ static bool g_comment_collection_create_db_table(const GCommentCollection *, sql static bool g_comment_collection_setup_load(GCommentCollection *, bound_value **, size_t *); /* Détermine si un élément est déjà présent ou non. */ -static GDbItem *g_comment_collection_has_key(GCommentCollection *, va_list *); +static GDbItem *g_comment_collection_has_key(GCommentCollection *, va_list); @@ -1121,7 +1121,7 @@ static bool g_comment_collection_setup_load(GCommentCollection *collec, bound_va * * ******************************************************************************/ -static GDbItem *g_comment_collection_has_key(GCommentCollection *collec, va_list *ap) +static GDbItem *g_comment_collection_has_key(GCommentCollection *collec, va_list ap) { GDbItem *result; /* Bilan à retourner */ vmpa2t *ref; /* Adresse de référence */ diff --git a/src/analysis/db/items/move.c b/src/analysis/db/items/move.c index 6cf1592..ad574b0 100644 --- a/src/analysis/db/items/move.c +++ b/src/analysis/db/items/move.c @@ -144,7 +144,7 @@ static bool g_move_collection_create_db_table(const GMoveCollection *, sqlite3 * static bool g_move_collection_setup_load(GMoveCollection *, bound_value **, size_t *); /* Détermine si un élément est déjà présent ou non. */ -static GDbItem *g_move_collection_has_key(GMoveCollection *, va_list *); +static GDbItem *g_move_collection_has_key(GMoveCollection *, va_list); @@ -792,7 +792,7 @@ static bool g_move_collection_setup_load(GMoveCollection *collec, bound_value ** * * ******************************************************************************/ -static GDbItem *g_move_collection_has_key(GMoveCollection *collec, va_list *ap) +static GDbItem *g_move_collection_has_key(GMoveCollection *collec, va_list ap) { GDbItem *result; /* Bilan à retourner */ vmpa2t *ref; /* Adresse de référence */ diff --git a/src/analysis/db/items/switcher.c b/src/analysis/db/items/switcher.c index 40a218c..e9182b4 100644 --- a/src/analysis/db/items/switcher.c +++ b/src/analysis/db/items/switcher.c @@ -144,7 +144,7 @@ static bool g_switcher_collection_create_db_table(const GSwitcherCollection *, s static bool g_switcher_collection_setup_load(GSwitcherCollection *, bound_value **, size_t *); /* Détermine si un élément est déjà présent ou non. */ -static GDbItem *g_switcher_collection_has_key(GSwitcherCollection *, va_list *); +static GDbItem *g_switcher_collection_has_key(GSwitcherCollection *, va_list); @@ -944,7 +944,7 @@ static bool g_switcher_collection_setup_load(GSwitcherCollection *collec, bound_ * * ******************************************************************************/ -static GDbItem *g_switcher_collection_has_key(GSwitcherCollection *collec, va_list *ap) +static GDbItem *g_switcher_collection_has_key(GSwitcherCollection *collec, va_list ap) { GDbItem *result; /* Bilan à retourner */ vmpa2t *ref; /* Adresse de référence */ -- cgit v0.11.2-87-g4458