From 1de9967e2a13baca3df50b02903900e36cee64ae Mon Sep 17 00:00:00 2001 From: Cyrille Bagard Date: Fri, 24 Mar 2017 08:41:10 +0100 Subject: Fixed various copy/paste mistakes in the database protocol. --- ChangeLog | 7 +++++++ src/analysis/db/collection.c | 2 +- src/analysis/db/items/comment.c | 6 +++--- src/analysis/db/items/move.c | 4 ++-- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index d24904f..086aab9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 17-03-24 Cyrille Bagard + * src/analysis/db/collection.c: + * src/analysis/db/items/comment.c: + * src/analysis/db/items/move.c: + Fix various copy/paste mistakes in the database protocol. + +17-03-24 Cyrille Bagard + * src/analysis/routine.c: * src/analysis/routine.h: Build routine digest for tooltip hints. diff --git a/src/analysis/db/collection.c b/src/analysis/db/collection.c index 12194ca..475f7fd 100644 --- a/src/analysis/db/collection.c +++ b/src/analysis/db/collection.c @@ -280,7 +280,7 @@ bool g_db_collection_unpack(GDbCollection *collec, packed_buffer *pbuf, sqlite3 GList *found; /* Test de présence existante */ timestamp_t inactive; /* Horodatage de désactivation */ - result = extend_packed_buffer(pbuf, &tmp32, sizeof(uint32_t), true); + result = extract_packed_buffer(pbuf, &tmp32, sizeof(uint32_t), true); action = tmp32; if (action < 0 || action >= DBA_COUNT) diff --git a/src/analysis/db/items/comment.c b/src/analysis/db/items/comment.c index 15d541b..50522d9 100644 --- a/src/analysis/db/items/comment.c +++ b/src/analysis/db/items/comment.c @@ -465,7 +465,7 @@ static bool g_db_comment_unpack(GDbComment *comment, packed_buffer *pbuf) if (result) { - result = extend_packed_buffer(pbuf, &tmp32, sizeof(uint32_t), true); + result = extract_packed_buffer(pbuf, &tmp32, sizeof(uint32_t), true); comment->flags = tmp32; } @@ -474,13 +474,13 @@ static bool g_db_comment_unpack(GDbComment *comment, packed_buffer *pbuf) if (result) { - result = extend_packed_buffer(pbuf, &tmp8, sizeof(uint8_t), true); + result = extract_packed_buffer(pbuf, &tmp8, sizeof(uint8_t), true); comment->inlined = tmp8; } if (result) { - result = extend_packed_buffer(pbuf, &tmp8, sizeof(uint8_t), true); + result = extract_packed_buffer(pbuf, &tmp8, sizeof(uint8_t), true); comment->repeatable = tmp8; } diff --git a/src/analysis/db/items/move.c b/src/analysis/db/items/move.c index ddbcab1..f6e585d 100644 --- a/src/analysis/db/items/move.c +++ b/src/analysis/db/items/move.c @@ -331,10 +331,10 @@ static bool g_db_move_unpack(GDbMove *move, packed_buffer *pbuf) result = G_DB_ITEM_CLASS(g_db_move_parent_class)->unpack(G_DB_ITEM(move), pbuf); if (result) - result = pack_vmpa(&move->src, pbuf); + result = unpack_vmpa(&move->src, pbuf); if (result) - result = pack_vmpa(&move->dest, pbuf); + result = unpack_vmpa(&move->dest, pbuf); return result; -- cgit v0.11.2-87-g4458