X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.c;h=eb18708c5742ff8e5c603ba9bf05efca5bace21d;hp=1f3fafacec1c757b47659c77d2bf2da1062e3cbf;hb=23b121a85984baa9252f4b4c0b8c4f186e394bb7;hpb=ff12b505b227585daf5aecc822d6b2e8841c2be7 diff --git a/afs.c b/afs.c index 1f3fafac..eb18708c 100644 --- a/afs.c +++ b/afs.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2012 Andre Noll + * Copyright (C) 2007-2013 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -87,7 +87,7 @@ static struct command_task command_task_struct; static struct signal_task signal_task_struct; static enum play_mode current_play_mode; -static char *current_mop; /* mode or playlist specifier. NULL means dummy mooe */ +static char *current_mop; /* mode or playlist specifier. NULL means dummy mood */ /** * A random number used to "authenticate" the connection. @@ -113,7 +113,7 @@ extern uint32_t afs_socket_cookie; * area is written to the command socket. * * The afs process accepts connections on the command socket and reads the - * shared memory id, attaches the corresponing area, calls the given handler to + * shared memory id, attaches the corresponding area, calls the given handler to * perform the desired action and to optionally compute a result. * * The result and a \p callback_result structure is then written to another @@ -133,7 +133,7 @@ struct callback_query { /** * Structure embedded in the result of a callback. * - * If the callback produced a result, an instance of that structure is embeeded + * If the callback produced a result, an instance of that structure is embedded * into the shared memory area holding the result, mainly to let the command * handler know the size of the result. * @@ -604,6 +604,7 @@ int afs_cb_result_handler(struct osl_object *result, uint8_t band, { struct command_context *cc = private; + assert(cc); if (!result->size) return 1; if (cc->use_sideband)