diff options
| author | Thiago de Arruda <tpadilha84@gmail.com> | 2014-05-31 08:17:59 -0300 |
|---|---|---|
| committer | Thiago de Arruda <tpadilha84@gmail.com> | 2014-05-31 08:17:59 -0300 |
| commit | d88494553946f6f570b5004df8eae5cf9d6ee86f (patch) | |
| tree | 51d95a2128560429ef291d485abef5e6d66dabe4 /src/nvim/os/server.c | |
| parent | a581173e715af4f7ef4e6be232ed828bd7dea9b8 (diff) | |
| parent | 82e3e7047f500b7523a2f36e76171a0e9fdee328 (diff) | |
| download | rneovim-d88494553946f6f570b5004df8eae5cf9d6ee86f.tar.gz rneovim-d88494553946f6f570b5004df8eae5cf9d6ee86f.tar.bz2 rneovim-d88494553946f6f570b5004df8eae5cf9d6ee86f.zip | |
Merge branch 'generic-key-value-map'
Diffstat (limited to 'src/nvim/os/server.c')
| -rw-r--r-- | src/nvim/os/server.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/nvim/os/server.c b/src/nvim/os/server.c index ee9a2e592c..4aac2babc6 100644 --- a/src/nvim/os/server.c +++ b/src/nvim/os/server.c @@ -40,7 +40,7 @@ typedef struct { } socket; } Server; -static Map(cstr_t) *servers = NULL; +static PMap(cstr_t) *servers = NULL; static void connection_cb(uv_stream_t *server, int status); static void free_client(uv_handle_t *handle); @@ -48,7 +48,7 @@ static void free_server(uv_handle_t *handle); void server_init() { - servers = map_new(cstr_t)(); + servers = pmap_new(cstr_t)(); if (!os_getenv("NEOVIM_LISTEN_ADDRESS")) { char *listen_address = (char *)vim_tempname('s'); @@ -88,7 +88,7 @@ void server_start(char *endpoint) } // Check if the server already exists - if (map_has(cstr_t)(servers, addr)) { + if (pmap_has(cstr_t)(servers, addr)) { EMSG2("Already listening on %s", addr); return; } @@ -172,7 +172,7 @@ void server_start(char *endpoint) server->type = server_type; // Add the server to the hash table - map_put(cstr_t)(servers, addr, server); + pmap_put(cstr_t)(servers, addr, server); } void server_stop(char *endpoint) @@ -183,7 +183,7 @@ void server_stop(char *endpoint) // Trim to `ADDRESS_MAX_SIZE` xstrlcpy(addr, endpoint, sizeof(addr)); - if ((server = map_get(cstr_t)(servers, addr)) == NULL) { + if ((server = pmap_get(cstr_t)(servers, addr)) == NULL) { EMSG2("Not listening on %s", addr); return; } @@ -194,7 +194,7 @@ void server_stop(char *endpoint) uv_close((uv_handle_t *)&server->socket.pipe.handle, free_server); } - map_del(cstr_t)(servers, addr); + pmap_del(cstr_t)(servers, addr); } static void connection_cb(uv_stream_t *server, int status) |