From 708fbb02de35f7341abdfb563d782a5ec12a8d71 Mon Sep 17 00:00:00 2001 From: Jef Driesen Date: Tue, 2 Jul 2019 21:45:19 +0200 Subject: [PATCH] Mark the string tables as constant Not only the strings in the table are constant, but also the table itself. This allows the compiler to place the table in a read-only data section. --- src/descriptor.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/descriptor.c b/src/descriptor.c index a63dca4..062da5e 100644 --- a/src/descriptor.c +++ b/src/descriptor.c @@ -420,7 +420,7 @@ dc_filter_internal (const void *key, const void *values, size_t count, size_t si return count == 0; } -static const char *rfcomm[] = { +static const char * const rfcomm[] = { #if defined (__linux__) "/dev/rfcomm", #endif @@ -429,7 +429,7 @@ static const char *rfcomm[] = { static int dc_filter_uwatec (dc_transport_t transport, const void *userdata) { - static const char *irda[] = { + static const char * const irda[] = { "Aladin Smart Com", "Aladin Smart Pro", "Aladin Smart Tec", @@ -444,7 +444,7 @@ static int dc_filter_uwatec (dc_transport_t transport, const void *userdata) {0x2e6c, 0x4201}, // G2 HUD {0xc251, 0x2006}, // Aladin Square }; - static const char *bluetooth[] = { + static const char * const bluetooth[] = { "G2", "Aladin", "HUD", @@ -468,7 +468,7 @@ static int dc_filter_suunto (dc_transport_t transport, const void *userdata) {0x1493, 0x0033}, // Eon Core {0x1493, 0x0035}, // D5 }; - static const char *bluetooth[] = { + static const char * const bluetooth[] = { "EON Steel", "EON Core", "Suunto D5", @@ -485,7 +485,7 @@ static int dc_filter_suunto (dc_transport_t transport, const void *userdata) static int dc_filter_hw (dc_transport_t transport, const void *userdata) { - static const char *bluetooth[] = { + static const char * const bluetooth[] = { "OSTC", "FROG", }; @@ -501,7 +501,7 @@ static int dc_filter_hw (dc_transport_t transport, const void *userdata) static int dc_filter_shearwater (dc_transport_t transport, const void *userdata) { - static const char *bluetooth[] = { + static const char * const bluetooth[] = { "Predator", "Petrel", "Nerd", @@ -520,7 +520,7 @@ static int dc_filter_shearwater (dc_transport_t transport, const void *userdata) static int dc_filter_tecdiving (dc_transport_t transport, const void *userdata) { - static const char *bluetooth[] = { + static const char * const bluetooth[] = { "DiveComputer", }; @@ -535,7 +535,7 @@ static int dc_filter_tecdiving (dc_transport_t transport, const void *userdata) static int dc_filter_mares (dc_transport_t transport, const void *userdata) { - static const char *bluetooth[] = { + static const char * const bluetooth[] = { "Mares bluelink pro", };