treewide: rename exec_timeout to rpc_exec_timeout

Rename the extern int to denote a global symbol.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>

diff --git a/exec.c b/exec.c
index 146e62b6fd4bf9b01d413a3cf8e9b7e292134ef8..eb529664a6ad98457892d1d800d9e4ff2676943c 100644 (file)
--- a/exec.c
+++ b/exec.c
@@ -350,7 +350,7 @@ rpc_exec(const char **args, rpc_exec_write_cb_t in,
                uloop_process_add(&c->process);
 
                c->timeout.cb = rpc_exec_timeout_cb;
-               uloop_timeout_set(&c->timeout, exec_timeout);
+               uloop_timeout_set(&c->timeout, rpc_exec_timeout);
 
                if (c->stdin_cb)
                {

diff --git a/file.c b/file.c
index fbc099c43a8f2d4f4703038c50ef056ef724ab2e..e1bc0acc6b2ea8dda7cd96c8b74e180d94bf2027 100644 (file)
--- a/file.c
+++ b/file.c
@@ -690,7 +690,7 @@ rpc_file_exec_run(const char *cmd,
                uloop_process_add(&c->process);
 
                c->timeout.cb = rpc_file_exec_timeout_cb;
-               uloop_timeout_set(&c->timeout, exec_timeout);
+               uloop_timeout_set(&c->timeout, rpc_exec_timeout);
 
                close(opipe[1]);
                close(epipe[1]);

diff --git a/include/rpcd/exec.h b/include/rpcd/exec.h
index 01981fe34e5d389b1e5591930f7bdb865905ca04..928f5edbd44e9c5caecaf6dd1c516f744050e17c 100644 (file)
--- a/include/rpcd/exec.h
+++ b/include/rpcd/exec.h
@@ -50,7 +50,7 @@
                ustream_fd_init(&us, fd);                             \
        } while(0)
 
-extern int exec_timeout;
+extern int rpc_exec_timeout;
 
 typedef int (*rpc_exec_write_cb_t)(struct ustream *, void *);
 typedef int (*rpc_exec_read_cb_t)(struct blob_buf *, char *, int, void *);

diff --git a/main.c b/main.c
index 4ea5f2ce9eb40a3e799ec73cc34e0a5e4680e5c3..1db3241958f0d61ba01c59a5f6710b7d6839e58b 100644 (file)
--- a/main.c
+++ b/main.c
@@ -33,7 +33,7 @@
 static struct ubus_context *ctx;
 static bool respawn = false;
 
-int exec_timeout = RPC_EXEC_DEFAULT_TIMEOUT;
+int rpc_exec_timeout = RPC_EXEC_DEFAULT_TIMEOUT;
 
 static void
 handle_signal(int sig)
@@ -74,7 +74,7 @@ int main(int argc, char **argv)
                        break;
 
                case 't':
-                       exec_timeout = 1000 * strtol(optarg, NULL, 0);
+                       rpc_exec_timeout = 1000 * strtol(optarg, NULL, 0);
                        break;
 
                default:
@@ -82,7 +82,7 @@ int main(int argc, char **argv)
                }
        }
 
-       if (exec_timeout < 1000 || exec_timeout > 600000) {
+       if (rpc_exec_timeout < 1000 || rpc_exec_timeout > 600000) {
                fprintf(stderr, "Invalid execution timeout specified\n");
                return -1;
        }