From 31f250a92d7c29fb1c715c43a27f59b86b150c3e Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Wed, 13 Dec 2023 17:39:18 +0000 Subject: [PATCH] making use of const in function definition --- Router/Router.h | 6 +++--- Utils/ApplicationUtils.h | 8 ++++---- Utils/ArrayUtils.h | 22 +++++++++++----------- Utils/ColorUtils.h | 2 +- Utils/Rng/StringUtils.h | 2 +- Utils/StringUtils.h | 14 +++++++------- 6 files changed, 27 insertions(+), 27 deletions(-) diff --git a/Router/Router.h b/Router/Router.h index 890af8b..c18ae79 100755 --- a/Router/Router.h +++ b/Router/Router.h @@ -22,7 +22,7 @@ namespace Router { - typedef void (*RouterFunc)(int, char **); + typedef void (*RouterFunc)(int, const char **); typedef struct { Stdlib::HashTable::ht *routes; @@ -36,12 +36,12 @@ namespace Router return router; } - void set(Router *router, const char* route, void *endpoint) + void set(const Router *router, const char* route, void *endpoint) { Stdlib::HashTable::set_entry(router->routes, route, endpoint); } - RouterFunc match_route(Router *router, const char *uri) + RouterFunc match_route(const Router *router, const char *uri) { RouterFunc ptr = NULL; Stdlib::HashTable::it itr = Stdlib::HashTable::table_iterator(router->routes); diff --git a/Utils/ApplicationUtils.h b/Utils/ApplicationUtils.h index 5e48ba9..9148396 100755 --- a/Utils/ApplicationUtils.h +++ b/Utils/ApplicationUtils.h @@ -34,11 +34,11 @@ namespace Utils } inline - void chdir_application(char *cwd, char *arg) + void chdir_application(const char *cwd, const char *arg) { - char *pos = strrchr(arg, '/'); + char *pos = strrchr((char *) arg, '/'); if (pos == NULL) { - pos = strrchr(arg, '\\'); + pos = strrchr((char *) arg, '\\'); } char* dir = (char *) calloc((pos - arg + 1), sizeof(char)); @@ -54,7 +54,7 @@ namespace Utils } inline - const char *compile_arg_line(int argc, char **argv) + const char *compile_arg_line(int argc, const char **argv) { size_t max = 512; size_t length = 0; diff --git a/Utils/ArrayUtils.h b/Utils/ArrayUtils.h index fe7c8f7..dad7fff 100755 --- a/Utils/ArrayUtils.h +++ b/Utils/ArrayUtils.h @@ -19,7 +19,7 @@ namespace Utils::ArrayUtils { inline - char* get_arg(const char *id, char **argv, size_t size) + const char* get_arg(const char *id, const char **argv, size_t size) { if (Utils::StringUtils::is_number(id)) { return argv[atoi(id)]; @@ -35,7 +35,7 @@ namespace Utils::ArrayUtils } inline - bool has_arg(const char *id, char **argv, size_t size) + bool has_arg(const char *id, const char **argv, size_t size) { for (size_t i = 0; i < size; ++i) { if (strcmp(id, argv[i]) == 0) { @@ -47,7 +47,7 @@ namespace Utils::ArrayUtils } inline - double array_sum_double(double *array, size_t size) + double array_sum_double(const double *array, size_t size) { double sum = 0.0; for (size_t i = 0; i < size; ++i) { @@ -58,7 +58,7 @@ namespace Utils::ArrayUtils } inline - float array_sum_float(float *array, size_t size) + float array_sum_float(const float *array, size_t size) { float sum = 0.0; for (size_t i = 0; i < size; ++i) { @@ -69,7 +69,7 @@ namespace Utils::ArrayUtils } inline - int64_t array_sum_int(int64_t *array, size_t size) + int64_t array_sum_int(const int64_t *array, size_t size) { int64_t sum = 0; for (size_t i = 0; i < size; ++i) { @@ -92,7 +92,7 @@ namespace Utils::ArrayUtils } inline - size_t find_in_array_double(double element, double *array, size_t size) + size_t find_in_array_double(double element, const double *array, size_t size) { for (size_t i = 0; i < size; ++i) { if (array[i] == element) { @@ -104,7 +104,7 @@ namespace Utils::ArrayUtils } inline - size_t find_in_array_float(float element, float *array, size_t size) + size_t find_in_array_float(float element, const float *array, size_t size) { for (size_t i = 0; i < size; ++i) { if (array[i] == element) { @@ -116,7 +116,7 @@ namespace Utils::ArrayUtils } inline - size_t find_in_array_int(int64_t element, int64_t *array, size_t size) + size_t find_in_array_int(int64_t element, const int64_t *array, size_t size) { for (size_t i = 0; i < size; ++i) { if (array[i] == element) { @@ -128,7 +128,7 @@ namespace Utils::ArrayUtils } inline - double* merge_arrays_double(double* array1, size_t size1, double* array2, size_t size2) + double* merge_arrays_double(const double* array1, size_t size1, const double* array2, size_t size2) { double* merged = (double*) malloc((size1 + size2) * sizeof(double)); if (merged == NULL) { @@ -147,7 +147,7 @@ namespace Utils::ArrayUtils } inline - float* merge_arrays_float(float* array1, size_t size1, float* array2, size_t size2) + float* merge_arrays_float(const float* array1, size_t size1, const float* array2, size_t size2) { float* merged = (float*) malloc((size1 + size2) * sizeof(float)); if (merged == NULL) { @@ -166,7 +166,7 @@ namespace Utils::ArrayUtils } inline - int64_t* merge_arrays_int(int64_t* array1, size_t size1, int64_t* array2, size_t size2) + int64_t* merge_arrays_int(const int64_t* array1, size_t size1, const int64_t* array2, size_t size2) { int64_t* merged = (int64_t*) malloc((size1 + size2) * sizeof(int64_t)); if (merged == NULL) { diff --git a/Utils/ColorUtils.h b/Utils/ColorUtils.h index 70ae286..46c0efd 100644 --- a/Utils/ColorUtils.h +++ b/Utils/ColorUtils.h @@ -34,7 +34,7 @@ namespace Utils::ColorUtils } inline - int rgb_to_int(RGB* rgb) + int rgb_to_int(const RGB* rgb) { int i = (255 & rgb->r) << 16; i += (255 & rgb->g) << 8; diff --git a/Utils/Rng/StringUtils.h b/Utils/Rng/StringUtils.h index 66aecf6..f1a3600 100755 --- a/Utils/Rng/StringUtils.h +++ b/Utils/Rng/StringUtils.h @@ -19,7 +19,7 @@ namespace Utils::Rng::StringUtils inline char* generate_string( size_t min = 10, size_t max = 10, - char *charset = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", int charsetLength = 62 + const char *charset = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", int charsetLength = 62 ) { srand(time(0)); diff --git a/Utils/StringUtils.h b/Utils/StringUtils.h index acab707..e7a79b2 100755 --- a/Utils/StringUtils.h +++ b/Utils/StringUtils.h @@ -78,7 +78,7 @@ namespace Utils::StringUtils } inline - size_t str_count(char *str, char *substr) + size_t str_count(const char *str, const char *substr) { int l1 = strlen(str); int l2 = strlen(substr); @@ -96,7 +96,7 @@ namespace Utils::StringUtils } inline - char *strsep(char **sp, char *sep) + char *strsep(const char **sp, const char *sep) { char *p, *s; @@ -104,7 +104,7 @@ namespace Utils::StringUtils return(NULL); } - s = *sp; + s = (char *) *sp; p = s + strcspn(s, sep); if (*p != '\0') { @@ -113,12 +113,12 @@ namespace Utils::StringUtils *sp = p; - return(s); + return s; } // @todo Implement delim as const char* (also allow \0 length) inline - int str_split(char **list, char *str, const char delim) + int str_split(char **list, const char *str, const char delim) { size_t splits = str_count(str, (char *) &delim) + 1; list = (char **) malloc(splits * sizeof(char *)); @@ -138,7 +138,7 @@ namespace Utils::StringUtils // @todo Implement delim as const char* (also allow \0 length) inline - char* str_combine(char **str, size_t size, const char delim) + char* str_combine(const char **str, size_t size, const char delim) { if (size < 1) { return NULL; @@ -173,7 +173,7 @@ namespace Utils::StringUtils size_t size; } text_diff; - text_diff computeLCSDiff(char **from, int fromSize, char **to, int toSize) + text_diff computeLCSDiff(const char **from, size_t fromSize, const char **to, size_t toSize) { char **diffValues = (char **) malloc(fromSize * toSize * sizeof(char *)); int64_t *diffMasks = (int64_t *) calloc(fromSize * toSize, sizeof(int64_t));