diff options
Diffstat (limited to 'src/mds-server')
| -rw-r--r-- | src/mds-server/client.c | 2 | ||||
| -rw-r--r-- | src/mds-server/mds-server.c | 10 | ||||
| -rw-r--r-- | src/mds-server/receiving.c | 10 | ||||
| -rw-r--r-- | src/mds-server/slavery.c | 4 |
4 files changed, 13 insertions, 13 deletions
diff --git a/src/mds-server/client.c b/src/mds-server/client.c index 37ba906..4f5f997 100644 --- a/src/mds-server/client.c +++ b/src/mds-server/client.c @@ -262,7 +262,7 @@ size_t client_unmarshal(client_t* restrict this, char* restrict data) rc += n * sizeof(char); return rc; - pfail: + fail: saved_errno = errno; mds_message_destroy(&(this->message)); for (i = 0; i < this->interception_conditions_count; i++) diff --git a/src/mds-server/mds-server.c b/src/mds-server/mds-server.c index abfc871..8ef44cc 100644 --- a/src/mds-server/mds-server.c +++ b/src/mds-server/mds-server.c @@ -148,7 +148,7 @@ int preinitialise_server(void) return 0; - pfail: + fail: xperror(*argv); return 1; } @@ -348,7 +348,7 @@ void* slave_loop(void* data) return NULL; - pfail: + fail: xperror(*argv); goto done; @@ -483,7 +483,7 @@ void queue_message_multicast(char* message, size_t length, client_t* sender) multicast->message_prefix = n; message = NULL; -#define pfail fail_in_mutex +#define fail fail_in_mutex /* Queue message multicasting. */ with_mutex (sender->mutex, new_buf = sender->multicasts; @@ -496,7 +496,7 @@ void queue_message_multicast(char* message, size_t length, client_t* sender) fail_in_mutex: xperror(*argv); ); -#undef pfail +#undef fail done: /* Release resources. */ @@ -509,7 +509,7 @@ void queue_message_multicast(char* message, size_t length, client_t* sender) free(multicast); return; - pfail: + fail: xperror(*argv); goto done; } diff --git a/src/mds-server/receiving.c b/src/mds-server/receiving.c index 100d717..71f1210 100644 --- a/src/mds-server/receiving.c +++ b/src/mds-server/receiving.c @@ -93,7 +93,7 @@ static int modifying_notify(client_t* client, mds_message_t message, uint64_t mo return 0; - pfail: + fail: xperror(*argv); if (multicast != NULL) { @@ -205,7 +205,7 @@ static int assign_and_send_id(client_t* client, const char* message_id) /* Queue message to be sent when this function returns. This done to simplify `multicast_message` for re-exec and termination. */ -#define pfail fail_in_mutex +#define fail fail_in_mutex with_mutex (client->mutex, if (client->send_pending_size == 0) { @@ -226,9 +226,9 @@ static int assign_and_send_id(client_t* client, const char* message_id) (msgbuf = NULL, rc = 0, errno = 0); fail_in_mutex: ); -#undef pfail +#undef fail - pfail: /* Also success. */ + fail: /* Also success. */ xperror(*argv); free(msgbuf); return rc; @@ -329,7 +329,7 @@ int message_received(client_t* client) return 0; - pfail: + fail: xperror(*argv); free(msgbuf); return 0; diff --git a/src/mds-server/slavery.c b/src/mds-server/slavery.c index a951f99..7ff801d 100644 --- a/src/mds-server/slavery.c +++ b/src/mds-server/slavery.c @@ -130,7 +130,7 @@ client_t* initialise_client(int client_fd) return information; - pfail: + fail: saved_errno = errno; if (locked) pthread_mutex_unlock(&slave_mutex); @@ -139,6 +139,6 @@ client_t* initialise_client(int client_fd) { with_mutex (slave_mutex, linked_list_remove(&client_list, entry);); } - return saved_errno = errno, NULL; + return errno = saved_errno, NULL; } |