Hi all, I'm sending you a new set of patches -- fix for warning that appears when building with 51Degrees release that uses a new Hash Trie algorithm (release version 3.2.12.12):
* BUILD/MINOR: 51d: fix warning when building with 51Degrees release version 3.2.12.12 * DOC: 51d: add 51Degrees git URL that points to release version 3.2.12.12 Patches can be backported in 1.7. Best regards, Dragan Dosen
From e4a7e7b4ef2758e3cc783788a82ec1295a195955 Mon Sep 17 00:00:00 2001 From: Dragan Dosen <[email protected]> Date: Wed, 27 Sep 2017 12:46:44 +0200 Subject: [PATCH 1/2] BUILD/MINOR: 51d: fix warning when building with 51Degrees release version 3.2.12.12 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The warning appears when building with 51Degrees release that uses a new Hash Trie algorithm (release version 3.2.12.12): src/51d.c: In function ‘init_51degrees’: src/51d.c:566:2: warning: enumeration value ‘DATA_SET_INIT_STATUS_TOO_MANY_OPEN_FILES’ not handled in switch [-Wswitch] switch (_51d_dataset_status) { ^ This patch can be backported in 1.7. --- src/51d.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/51d.c b/src/51d.c index 421c0de..1f1a5f9 100644 --- a/src/51d.c +++ b/src/51d.c @@ -605,6 +605,9 @@ static int init_51degrees(void) case DATA_SET_INIT_STATUS_NOT_SET: chunk_printf(temp, "Data set not initialised."); break; + default: + chunk_printf(temp, "Other error."); + break; } if (_51d_dataset_status != DATA_SET_INIT_STATUS_SUCCESS) { if (temp->len) -- 2.7.4
From c43e81e4cec92f15bdd6269b364a74dc2cc0c760 Mon Sep 17 00:00:00 2001 From: Dragan Dosen <[email protected]> Date: Wed, 27 Sep 2017 12:55:07 +0200 Subject: [PATCH 2/2] DOC: 51d: add 51Degrees git URL that points to release version 3.2.12.12 The 51Degrees C library version 3.2.12.12 has support for a new Hash Trie algorithm. This patch can be backported in 1.7. --- doc/51Degrees-device-detection.txt | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/doc/51Degrees-device-detection.txt b/doc/51Degrees-device-detection.txt index 71b2eb7..bc8c600 100644 --- a/doc/51Degrees-device-detection.txt +++ b/doc/51Degrees-device-detection.txt @@ -12,9 +12,18 @@ need. Attributes of the device making a web request can be added to HTTP headers as configurable parameters. In order to enable 51Degrees download the 51Degrees source code from the -official github repository : +official git repository : - git clone https://git.51Degrees.com/Device-Detection.git -b v3.2.10 + - either use the proven stable but frozen 3.2.10 version which + supports the Trie algorithm : + + git clone https://git.51Degrees.com/Device-Detection.git -b v3.2.10 + + - or use the new 3.2.12.12 version which continues to receive database + updates and supports a new Hash Trie algorithm, but which is not + compatible with older Trie databases : + + git clone https://github.com/51Degrees/Device-Detection.git -b 3.2.12.12 then run 'make' with USE_51DEGREES and 51DEGREES_SRC set. Both 51DEGREES_INC and 51DEGREES_LIB may additionally be used to force specific different paths -- 2.7.4
