From kde-commits  Thu Aug 30 21:19:25 2018
From: Jaroslaw Staniek <null () kde ! org>
Date: Thu, 30 Aug 2018 21:19:25 +0000
To: kde-commits
Subject: [kexi/3.1] src/migration/mdb/3rdparty/mdbtools/libmdb: MDB: Finalize removal of num_bytes defines (s
Message-Id: <E1fvULd-0003tX-0p () code ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=153566429003421

Git commit 82a619c04ad2b15a15fc0b02426c72938edb2ccc by Jaroslaw Staniek.
Committed on 30/08/2018 at 21:02.
Pushed by staniek into branch '3.1'.

MDB: Finalize removal of num_bytes defines

GIT_SILENT

M  +2    -5    src/migration/mdb/3rdparty/mdbtools/libmdb/money.c

https://commits.kde.org/kexi/82a619c04ad2b15a15fc0b02426c72938edb2ccc

diff --git a/src/migration/mdb/3rdparty/mdbtools/libmdb/money.c b/src/migra=
tion/mdb/3rdparty/mdbtools/libmdb/money.c
index 11584d042..eaea04ae3 100644
--- a/src/migration/mdb/3rdparty/mdbtools/libmdb/money.c
+++ b/src/migration/mdb/3rdparty/mdbtools/libmdb/money.c
@@ -47,7 +47,7 @@ char *mdb_money_to_string(MdbHandle *mdb, int start)
 	int neg=3D0;
        unsigned char multiplier[MAX_NUMERIC_PRECISION], temp[MAX_NUMERIC_P=
RECISION];
        unsigned char product[MAX_NUMERIC_PRECISION];
-       unsigned char bytes[8];
+       unsigned char bytes[num_bytes];
 =

        memset(multiplier,0,MAX_NUMERIC_PRECISION);
        memset(product,0,MAX_NUMERIC_PRECISION);
@@ -76,8 +76,6 @@ char *mdb_money_to_string(MdbHandle *mdb, int start)
 		multiply_byte(multiplier, 256, temp);
 	}
        return array_to_string(product, scale, neg);
-
-#undef num_bytes
 }
 =

 char *mdb_numeric_to_string(MdbHandle *mdb, int start, int prec, int scale=
) {
@@ -86,7 +84,7 @@ char *mdb_numeric_to_string(MdbHandle *mdb, int start, in=
t prec, int scale) {
        int neg=3D0;
        unsigned char multiplier[MAX_NUMERIC_PRECISION], temp[MAX_NUMERIC_P=
RECISION];
        unsigned char product[MAX_NUMERIC_PRECISION];
-       unsigned char bytes[16];
+       unsigned char bytes[num_bytes];
 =

        memset(multiplier,0,MAX_NUMERIC_PRECISION);
        memset(product,0,MAX_NUMERIC_PRECISION);
@@ -105,7 +103,6 @@ char *mdb_numeric_to_string(MdbHandle *mdb, int start, =
int prec, int scale) {
                multiply_byte(multiplier, 256, temp);
        }
        return array_to_string(product, scale, neg);
-#undef num_bytes
 }
 =

 static int multiply_byte(unsigned char *product, int num, unsigned char *m=
ultiplier)