upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-04-21 06:06:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

BUG/MINOR: 51d: Aligned const pointers to changes in 51Degrees.

Browse source 
Parameters provided to 51Degrees methods that have changed to require
const pointers are now cast to avoid compiler warnings.

This should be backported to 1.6.
This commit is contained in:
ben@51degrees.com 2016-01-08 13:49:32 +00:00 committed by Willy Tarreau
parent 6baceb9f64
commit 496299a4d5
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/51d.c
View file

@ -269,7 +269,7 @@ static void _51d_process_match(const struct arg *args, struct sample *smp, fifty
static void _51d_process_match(const struct arg *args, struct sample *smp)
{
char valuesBuffer[1024];
char **requiredProperties = fiftyoneDegreesGetRequiredPropertiesNames();
const char **requiredProperties = fiftyoneDegreesGetRequiredPropertiesNames();
int requiredPropertiesCount = fiftyoneDegreesGetRequiredPropertiesCount();
fiftyoneDegreesDeviceOffsets *deviceOffsets = &global._51degrees.device_offsets;
@ -501,7 +501,7 @@ void _51d_init_http_headers()
global._51degrees.header_offsets = (int32_t*)malloc(global._51degrees.header_count * sizeof(int32_t));
for (index = 0; index < global._51degrees.header_count; index++) {
global._51degrees.header_offsets[index] = fiftyoneDegreesGetHttpHeaderNameOffset(index);
global._51degrees.header_names[index].str = fiftyoneDegreesGetHttpHeaderNamePointer(index);
global._51degrees.header_names[index].str = (char*)fiftyoneDegreesGetHttpHeaderNamePointer(index);
global._51degrees.header_names[index].len = strlen(global._51degrees.header_names[index].str);
global._51degrees.header_names[index].size = global._51degrees.header_names[index].len;
}
@ -531,10 +531,10 @@ int init_51degrees(void)
}
#ifdef FIFTYONEDEGREES_H_PATTERN_INCLUDED
_51d_dataset_status = fiftyoneDegreesInitWithPropertyArray(global._51degrees.data_file_path, &global._51degrees.data_set, _51d_property_list, i);
_51d_dataset_status = fiftyoneDegreesInitWithPropertyArray(global._51degrees.data_file_path, &global._51degrees.data_set, (const char**)_51d_property_list, i);
#endif
#ifdef FIFTYONEDEGREES_H_TRIE_INCLUDED
_51d_dataset_status = fiftyoneDegreesInitWithPropertyArray(global._51degrees.data_file_path, _51d_property_list, i);
_51d_dataset_status = fiftyoneDegreesInitWithPropertyArray(global._51degrees.data_file_path, (const char**)_51d_property_list, i);
#endif
temp = get_trash_chunk();