diff options
| author | Mattias Andrée <maandree@operamail.com> | 2014-12-09 13:15:10 +0100 |
|---|---|---|
| committer | Mattias Andrée <maandree@operamail.com> | 2014-12-09 13:15:10 +0100 |
| commit | 7a994c9631c590d6a73c842fa5d2d3567b4771dd (patch) | |
| tree | 228ade01f99ba217151a0ed20f29c5f3a5028619 /src/mds-server/slavery.h | |
| parent | mds-kbdc: compile-layout: macro_call: fix bug: do not duplicate the arguments if there are none (diff) | |
| parent | report an error, rather than causing failure the caller but not for the called function (diff) | |
| download | mds-7a994c9631c590d6a73c842fa5d2d3567b4771dd.tar.gz mds-7a994c9631c590d6a73c842fa5d2d3567b4771dd.tar.bz2 mds-7a994c9631c590d6a73c842fa5d2d3567b4771dd.tar.xz | |
merge track-errors and resolve conflict
Signed-off-by: Mattias Andrée <maandree@operamail.com>
Diffstat (limited to 'src/mds-server/slavery.h')
| -rw-r--r-- | src/mds-server/slavery.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mds-server/slavery.h b/src/mds-server/slavery.h index 92144fd..00f6084 100644 --- a/src/mds-server/slavery.h +++ b/src/mds-server/slavery.h @@ -45,7 +45,7 @@ int create_slave(pthread_t* thread_slot, int slave_fd); * Initialise a client, except for threading * * @param client_fd The file descriptor of the client's socket - * @return The client information, NULL on error + * @return The client information, `NULL` on error */ client_t* initialise_client(int client_fd); |