From 7fec63611d1698795dcc10ffe1f1526a235189f8 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Wed, 4 Sep 2019 15:50:34 +0200 Subject: [PATCH] sys: fix symbol redeclaration Fixes: 27c24c7 ("rpcd: sys: actually move timespec declaration") Signed-off-by: Jo-Philipp Wich --- sys.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys.c b/sys.c index 60ff5d6..fecf66c 100644 --- a/sys.c +++ b/sys.c @@ -88,7 +88,7 @@ rpc_cgi_password_set(struct ubus_context *ctx, struct ubus_object *obj, ssize_t n; int ret; const char *const passwd = "/bin/passwd"; - const struct timespec req = {0, 100 * 1000 * 1000}; + const struct timespec ts = {0, 100 * 1000 * 1000}; blobmsg_parse(rpc_password_policy, __RPC_P_MAX, tb, blob_data(msg), blob_len(msg)); @@ -146,7 +146,7 @@ rpc_cgi_password_set(struct ubus_context *ctx, struct ubus_object *obj, if (n < 0) return rpc_errno_status(); - nanosleep(&req, NULL); + nanosleep(&ts, NULL); n = write(fds[1], blobmsg_data(tb[RPC_P_PASSWORD]), blobmsg_data_len(tb[RPC_P_PASSWORD]) - 1);