From 4e2ad7dae18d0bd9335bf6634bea597ee6acf601 Mon Sep 17 00:00:00 2001 From: Andreas Eversberg Date: Sun, 20 May 2018 11:35:06 +0200 Subject: Fix compiler warning in conjunction with strncpy --- src/libdisplay/display_measurements.c | 2 +- src/libdisplay/display_status.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/libdisplay') diff --git a/src/libdisplay/display_measurements.c b/src/libdisplay/display_measurements.c index 7c963cd..76c6ac3 100644 --- a/src/libdisplay/display_measurements.c +++ b/src/libdisplay/display_measurements.c @@ -202,7 +202,7 @@ static void print_measurements(int on) break; } /* "Deviation ::::::::::............ 4.5 KHz" */ - strncpy(line, param->name, (strlen(param->name) < MAX_NAME_LEN) ? strlen(param->name) : MAX_NAME_LEN); + memcpy(line, param->name, (strlen(param->name) < MAX_NAME_LEN) ? strlen(param->name) : MAX_NAME_LEN); if (isinf(value) || isnan(value)) { bar_left = -1; bar_right = -1; diff --git a/src/libdisplay/display_status.c b/src/libdisplay/display_status.c index 671dd7f..9a38d36 100644 --- a/src/libdisplay/display_status.c +++ b/src/libdisplay/display_status.c @@ -83,7 +83,7 @@ void display_status_start(void) { memset(screen, ' ', sizeof(screen)); memset(screen[0], '-', sizeof(screen[0])); - strncpy(screen[0] + 4, "Channel Status", 14); + memcpy(screen[0] + 4, "Channel Status", 14); line_count = 1; } @@ -103,7 +103,7 @@ void display_status_channel(int channel, const char *type, const char *state) else snprintf(line, sizeof(line), "Channel: %d State: %s", channel, state); line[sizeof(line) - 1] = '\0'; - strncpy(screen[line_count++], line, strlen(line)); + memcpy(screen[line_count++], line, strlen(line)); } void display_status_subscriber(const char *number, const char *state) @@ -118,7 +118,7 @@ void display_status_subscriber(const char *number, const char *state) else snprintf(line, sizeof(line), " Subscriber: %s", number); line[sizeof(line) - 1] = '\0'; - strncpy(screen[line_count++], line, strlen(line)); + memcpy(screen[line_count++], line, strlen(line)); } void display_status_end(void) -- cgit v1.2.3