From 05acff648b38e0d1cb700febff55ce5c8b72d0ff Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sat, 26 Oct 2024 12:33:02 +0000 Subject: [PATCH] *: Replace pakfire_remove_trailing_newline with pakfire_string_rstrip Signed-off-by: Michael Tremer --- src/libpakfire/arch.c | 2 +- src/libpakfire/file.c | 2 +- src/libpakfire/include/pakfire/util.h | 2 -- src/libpakfire/key.c | 2 +- src/libpakfire/parser.c | 2 +- src/libpakfire/util.c | 9 --------- 6 files changed, 4 insertions(+), 15 deletions(-) diff --git a/src/libpakfire/arch.c b/src/libpakfire/arch.c index c3081826e..064e27ba1 100644 --- a/src/libpakfire/arch.c +++ b/src/libpakfire/arch.c @@ -283,7 +283,7 @@ static char* find_interpreter(DIR* dir, const char* path, const char* magic) { break; // Remove the newline - pakfire_remove_trailing_newline(line); + pakfire_string_rstrip(line); // Look for the "enabled" line if (strcmp("enabled", line) == 0) { diff --git a/src/libpakfire/file.c b/src/libpakfire/file.c index c4f8a8bd0..8843c21fd 100644 --- a/src/libpakfire/file.c +++ b/src/libpakfire/file.c @@ -2089,7 +2089,7 @@ static int pakfire_file_fix_interpreter(struct pakfire_file* file, const char* i } // Remove the trailing newline - pakfire_remove_trailing_newline(line); + pakfire_string_rstrip(line); // Start at the beginning of the line (after shebang) p = line + 2; diff --git a/src/libpakfire/include/pakfire/util.h b/src/libpakfire/include/pakfire/util.h index 0b9794197..e8066f54c 100644 --- a/src/libpakfire/include/pakfire/util.h +++ b/src/libpakfire/include/pakfire/util.h @@ -51,8 +51,6 @@ static inline void* pakfire_realloc(void* p, size_t size) { time_t pakfire_path_age(const char* path); -char* pakfire_remove_trailing_newline(char* str); - int pakfire_read_file_into_buffer(FILE* f, char** buffer, size_t* len); #define pakfire_hexlify(digest) __pakfire_hexlify(digest, sizeof(digest)) diff --git a/src/libpakfire/key.c b/src/libpakfire/key.c index 9658c2394..788790bbd 100644 --- a/src/libpakfire/key.c +++ b/src/libpakfire/key.c @@ -139,7 +139,7 @@ static int pakfire_key_create(struct pakfire_key** key, struct pakfire_ctx* ctx, goto ERROR; // Remove any trailing newline - pakfire_remove_trailing_newline(k->comment); + pakfire_string_rstrip(k->comment); } // Return the pointer diff --git a/src/libpakfire/parser.c b/src/libpakfire/parser.c index b07fd3f32..ece3af4a0 100644 --- a/src/libpakfire/parser.c +++ b/src/libpakfire/parser.c @@ -484,7 +484,7 @@ static int pakfire_parser_expand_commands(struct pakfire_parser* parser, char** // Strip newline from output if (output) - pakfire_remove_trailing_newline(output); + pakfire_string_rstrip(output); // Find the entire matched pattern r = pcre2_substring_get_bynumber(match, 0, &pattern, &pattern_length); diff --git a/src/libpakfire/util.c b/src/libpakfire/util.c index d4fe0d76a..ec9fb9860 100644 --- a/src/libpakfire/util.c +++ b/src/libpakfire/util.c @@ -129,15 +129,6 @@ ERROR: return r; } -char* pakfire_remove_trailing_newline(char* str) { - ssize_t pos = strlen(str) - 1; - - if (str[pos] == '\n') - str[pos] = '\0'; - - return str; -} - int pakfire_read_file_into_buffer(FILE* f, char** buffer, size_t* len) { if (!f) return -EBADF; -- 2.39.5