diff options
Diffstat (limited to 'src/mds-server')
-rw-r--r-- | src/mds-server/interceptors.c | 6 | ||||
-rw-r--r-- | src/mds-server/mds-server.c | 12 | ||||
-rw-r--r-- | src/mds-server/receiving.c | 4 | ||||
-rw-r--r-- | src/mds-server/reexec.c | 6 | ||||
-rw-r--r-- | src/mds-server/sending.c | 6 | ||||
-rw-r--r-- | src/mds-server/slavery.c | 6 |
6 files changed, 20 insertions, 20 deletions
diff --git a/src/mds-server/interceptors.c b/src/mds-server/interceptors.c index 552d7a1..6d798d9 100644 --- a/src/mds-server/interceptors.c +++ b/src/mds-server/interceptors.c @@ -56,7 +56,7 @@ static void remove_intercept_condition(client_t* client, size_t index) } else if (xrealloc(conds, n, interception_condition_t)) - perror(*argv); + xperror(*argv); else client->interception_conditions = conds; } @@ -142,14 +142,14 @@ void add_intercept_condition(client_t* client, char* condition, int64_t priority /* Duplicate condition string. */ if ((condition = strdup(condition)) == NULL) { - perror(*argv); + xperror(*argv); return; } /* Grow the interception condition list. */ if (xrealloc(conds, n + 1, interception_condition_t)) { - perror(*argv); + xperror(*argv); free(condition); return; } diff --git a/src/mds-server/mds-server.c b/src/mds-server/mds-server.c index d0b6b87..46451a0 100644 --- a/src/mds-server/mds-server.c +++ b/src/mds-server/mds-server.c @@ -71,7 +71,7 @@ server_characteristics_t server_characteristics = if (I >= 6) linked_list_destroy(&client_list) #define error_if(I, CONDITION) \ - if (CONDITION) { perror(*argv); __free(I); return 1; } + if (CONDITION) { xperror(*argv); __free(I); return 1; } /** @@ -147,7 +147,7 @@ int preinitialise_server(void) return 0; pfail: - perror(*argv); + xperror(*argv); return 1; } @@ -239,7 +239,7 @@ int accept_connection(void) else if ((errno == ECONNABORTED) || (errno == EINVAL)) /* Closing. */ running = 0; else if (errno != EINTR) /* Error. */ - perror(*argv); + xperror(*argv); return 0; } @@ -339,7 +339,7 @@ void* slave_loop(void* data) pfail: - perror(*argv); + xperror(*argv); goto fail; @@ -477,7 +477,7 @@ void queue_message_multicast(char* message, size_t length, client_t* sender) new_buf = sender->multicasts; if (xrealloc(new_buf, sender->multicasts_count + 1, multicast_t)) { - perror(*argv); + xperror(*argv); goto fail_queue; } sender->multicasts = new_buf; @@ -499,7 +499,7 @@ void queue_message_multicast(char* message, size_t length, client_t* sender) return; pfail: - perror(*argv); + xperror(*argv); goto fail; } diff --git a/src/mds-server/receiving.c b/src/mds-server/receiving.c index e4dbfe3..016c04e 100644 --- a/src/mds-server/receiving.c +++ b/src/mds-server/receiving.c @@ -94,7 +94,7 @@ static int modifying_notify(client_t* client, mds_message_t message, uint64_t mo pfail: - perror(*argv); + xperror(*argv); if (multicast != NULL) { mds_message_destroy(multicast); @@ -328,7 +328,7 @@ int message_received(client_t* client) return 0; pfail: - perror(*argv); + xperror(*argv); free(msgbuf); return 0; } diff --git a/src/mds-server/reexec.c b/src/mds-server/reexec.c index eeedf99..981569e 100644 --- a/src/mds-server/reexec.c +++ b/src/mds-server/reexec.c @@ -183,7 +183,7 @@ int unmarshal_server(char* state_buf) /* Create memory address remapping table. */ if (hash_table_create(&unmarshal_remap_map)) { - perror(*argv); + xperror(*argv); hash_table_destroy(&unmarshal_remap_map, NULL, NULL); return -1; } @@ -232,7 +232,7 @@ int unmarshal_server(char* state_buf) /* On error, seek past all clients. */ continue; clients_fail: - perror(*argv); + xperror(*argv); with_error = 1; if (value != NULL) { @@ -294,7 +294,7 @@ int unmarshal_server(char* state_buf) critical_fail: - perror(*argv); + xperror(*argv); abort(); } diff --git a/src/mds-server/sending.c b/src/mds-server/sending.c index 338ce68..98bb26f 100644 --- a/src/mds-server/sending.c +++ b/src/mds-server/sending.c @@ -79,7 +79,7 @@ static int send_multicast_to_recipient(multicast_t* multicast, client_t* recipie n -= sent; multicast->message_ptr += sent / sizeof(char); if ((n > 0) && (errno != EINTR)) - perror(*argv); + xperror(*argv); } ); @@ -188,7 +188,7 @@ void multicast_message(multicast_t* multicast) old_buf = multicast->message; if (xrealloc(multicast->message, multicast->message_prefix + n, char)) { - perror(*argv); + xperror(*argv); multicast->message = old_buf; } else @@ -256,7 +256,7 @@ void send_reply_queue(client_t* client) sendbuf_ += sent / sizeof(char); if ((n > 0) && (errno != EINTR)) /* Ignore EINTR */ { - perror(*argv); + xperror(*argv); break; } } diff --git a/src/mds-server/slavery.c b/src/mds-server/slavery.c index 4b92154..283251a 100644 --- a/src/mds-server/slavery.c +++ b/src/mds-server/slavery.c @@ -61,7 +61,7 @@ int fetch_message(client_t* client) else if (errno != EINTR) { r = -2; - perror(*argv); + xperror(*argv); } return r; @@ -79,13 +79,13 @@ int create_slave(pthread_t* thread_slot, int slave_fd) { if ((errno = pthread_create(thread_slot, NULL, slave_loop, (void*)(intptr_t)slave_fd))) { - perror(*argv); + xperror(*argv); with_mutex (slave_mutex, running_slaves--;); return -1; } if ((errno = pthread_detach(*thread_slot))) { - perror(*argv); + xperror(*argv); return -1; } return 0; |