From 5322e83da0f32f1d6805a2c3f492cfd3c178d489 Mon Sep 17 00:00:00 2001 From: sin Date: Tue, 6 May 2014 13:36:49 +0100 Subject: [PATCH] str* is in the reserved namespace, rename to replacestr() --- sysctl.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sysctl.c b/sysctl.c index a43a333..4aea23c 100644 --- a/sysctl.c +++ b/sysctl.c @@ -8,7 +8,7 @@ #include "util.h" static void -streplace(char *s, int a, int b) +replacestr(char *s, int a, int b) { for (; *s; s++) if (*s == a) @@ -25,15 +25,15 @@ getsysctl(char *variable, char **value) ssize_t n; size_t sz, i; - streplace(variable, '.', '/'); + replacestr(variable, '.', '/'); strlcpy(path, "/proc/sys/", sizeof(path)); if (strlcat(path, variable, sizeof(path)) >= sizeof(path)) { - streplace(variable, '/', '.'); + replacestr(variable, '/', '.'); return -1; } - streplace(variable, '/', '.'); + replacestr(variable, '/', '.'); fd = open(path, O_RDONLY); if (fd < 0) @@ -83,15 +83,15 @@ setsysctl(char *variable, char *value) int fd; ssize_t n; - streplace(variable, '.', '/'); + replacestr(variable, '.', '/'); strlcpy(path, "/proc/sys/", sizeof(path)); if (strlcat(path, variable, sizeof(path)) >= sizeof(path)) { - streplace(variable, '/', '.'); + replacestr(variable, '/', '.'); return -1; } - streplace(variable, '/', '.'); + replacestr(variable, '/', '.'); fd = open(path, O_WRONLY); if (fd < 0)