diff options
author | Mattias Andrée <maandree@operamail.com> | 2014-12-08 19:34:26 +0100 |
---|---|---|
committer | Mattias Andrée <maandree@operamail.com> | 2014-12-08 19:34:26 +0100 |
commit | 3e07c8b1657e28f19072b430936e88be040fb319 (patch) | |
tree | 079b9c8b4669873578cce9eccd79d53c89467a1f /src/mds-registry | |
parent | m + make sure we never lose errno (diff) | |
download | mds-3e07c8b1657e28f19072b430936e88be040fb319.tar.gz mds-3e07c8b1657e28f19072b430936e88be040fb319.tar.bz2 mds-3e07c8b1657e28f19072b430936e88be040fb319.tar.xz |
rename pfail to fail
Signed-off-by: Mattias Andrée <maandree@operamail.com>
Diffstat (limited to 'src/mds-registry')
-rw-r--r-- | src/mds-registry/mds-registry.c | 6 | ||||
-rw-r--r-- | src/mds-registry/reexec.c | 2 | ||||
-rw-r--r-- | src/mds-registry/registry.c | 6 | ||||
-rw-r--r-- | src/mds-registry/slave.c | 6 |
4 files changed, 10 insertions, 10 deletions
diff --git a/src/mds-registry/mds-registry.c b/src/mds-registry/mds-registry.c index 9751ff4..44cbe86 100644 --- a/src/mds-registry/mds-registry.c +++ b/src/mds-registry/mds-registry.c @@ -66,7 +66,7 @@ int preinitialise_server(void) return 0; - pfail: + fail: xperror(*argv); if (stage >= 1) pthread_mutex_destroy(&slave_mutex); if (stage >= 2) pthread_cond_destroy(&slave_cond); @@ -117,7 +117,7 @@ int initialise_server(void) fail_if (mds_message_initialise(&received)); return 0; - pfail: + fail: xperror(*argv); mds_message_destroy(&received); return 1; @@ -188,7 +188,7 @@ int master_loop(void) rc = 0; goto done; - pfail: + fail: xperror(*argv); done: /* Join with all slaves threads. */ diff --git a/src/mds-registry/reexec.c b/src/mds-registry/reexec.c index 6b36cc8..6f6510e 100644 --- a/src/mds-registry/reexec.c +++ b/src/mds-registry/reexec.c @@ -197,7 +197,7 @@ int unmarshal_server(char* state_buf) } return 0; - pfail: + fail: xperror(*argv); mds_message_destroy(&received); if (stage >= 1) diff --git a/src/mds-registry/registry.c b/src/mds-registry/registry.c index 918b137..5f241ea 100644 --- a/src/mds-registry/registry.c +++ b/src/mds-registry/registry.c @@ -107,7 +107,7 @@ static int handle_close_message(void) free(keys); return 0; - pfail: + fail: xperror(*argv); free(keys); return -1; @@ -167,7 +167,7 @@ static int registry_action_add(int has_key, char* command, size_t command_key, u fail_if (advance_slaves(command)); return 0; - pfail: + fail: xperror(*argv); return -1; } @@ -239,7 +239,7 @@ static int registry_action_act(char* command, int action, uint64_t client, hash_ } return 0; - pfail: + fail: xperror(*argv); hash_table_destroy(wait_set, (free_func*)reg_table_free_key, NULL); free(wait_set); diff --git a/src/mds-registry/slave.c b/src/mds-registry/slave.c index 54774e2..8a4d221 100644 --- a/src/mds-registry/slave.c +++ b/src/mds-registry/slave.c @@ -114,7 +114,7 @@ static void* slave_loop(void* data) goto done; - pfail: + fail: xperror(*argv); done: with_mutex (slave_mutex, @@ -198,7 +198,7 @@ int start_slave(hash_table_t* restrict wait_set, const char* restrict recv_clien pthread_mutex_unlock(&slave_mutex); return 0; - pfail: + fail: xperror(*argv); if (locked) pthread_mutex_unlock(&slave_mutex); @@ -284,7 +284,7 @@ slave_t* slave_create(hash_table_t* restrict wait_set, const char* restrict recv return rc; - pfail: + fail: saved_errno = errno; slave_destroy(rc), free(rc); return errno = saved_errno, NULL; |