diff options
| author | nicm <nicm> | 2015-08-30 22:19:07 +0000 |
|---|---|---|
| committer | nicm <nicm> | 2015-08-30 22:19:07 +0000 |
| commit | dd92b6e83dbd4b5f24ad062c7944ca32add8d0e5 (patch) | |
| tree | f5e6ea398be66c736832a59b88505a3791a4fd8b /client.c | |
| parent | b87dc608d9b5b470926aaf77c5956befdfb7bc7b (diff) | |
Event base does not need to be global.
Diffstat (limited to 'client.c')
| -rw-r--r-- | client.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -52,7 +52,7 @@ const char *client_exitsession; int client_attached; int client_get_lock(char *); -int client_connect(char *, int); +int client_connect(struct event_base *, char *, int); void client_send_identify(int); int client_write_one(enum msgtype, int, const void *, size_t); int client_write_server(enum msgtype, const void *, size_t); @@ -96,7 +96,7 @@ client_get_lock(char *lockfile) /* Connect client to server. */ int -client_connect(char *path, int start_server) +client_connect(struct event_base *base, char *path, int start_server) { struct sockaddr_un sa; size_t size; @@ -149,7 +149,7 @@ retry: close(lockfd); return (-1); } - fd = server_start(lockfd, lockfile); + fd = server_start(base, lockfd, lockfile); } if (locked) { free(lockfile); @@ -203,7 +203,7 @@ client_exit_message(void) /* Client main loop. */ int -client_main(int argc, char **argv, int flags) +client_main(struct event_base *base, int argc, char **argv, int flags) { struct cmd *cmd; struct cmd_list *cmdlist; @@ -252,7 +252,7 @@ client_main(int argc, char **argv, int flags) set_signals(client_signal); /* Initialize the client socket and start the server. */ - fd = client_connect(socket_path, cmdflags & CMD_STARTSERVER); + fd = client_connect(base, socket_path, cmdflags & CMD_STARTSERVER); if (fd == -1) { if (errno == ECONNREFUSED) { fprintf(stderr, "no server running on %s\n", |