From df163841b20a7ef51190cc9e05cdc0cc80ce5b8a Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Sun, 5 Apr 2015 15:04:24 +0000 Subject: [PATCH] blob: Simplify stdin_command(). This function has only a single caller which passes a pointer to afs_cb_result_handler() as the result handler. Also the first and last parameter are both pointers to the command_context structure. This commit gets rid of the two arguments of the function and updates the documentation accordingly. Since it is a static function, we don't need doxygen comments for all arguments. --- blob.c | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/blob.c b/blob.c index 0092bea3..3073bf00 100644 --- a/blob.c +++ b/blob.c @@ -426,27 +426,16 @@ again: } /* - * Read data from a file descriptor, and send it to the afs process. + * Read blob from a file descriptor and send it to afs. * - * \param cc Contains the file descriptor to read data from. - * \param arg_obj Pointer to the arguments to \a f. - * \param f The callback function. - * \param result_handler See \ref send_callback_request. - * \param private_result_data See \ref send_callback_request. - * - * This function is used by the addblob commands that instruct para_server to - * store arbitrary data in a blob table. Input data is read and decrypted from - * the file descriptor given by \a cc. This data is concatenated with the - * buffer given by \a arg_obj, and the combined buffer is made available to the - * afs process via the callback method. See \ref send_callback_request for - * details. - * - * \return Negative on errors, the return value of the underlying call to - * send_callback_request() otherwise. + * This function is called from the addblob command handlers to instruct the + * afs process to store the input in a blob table. Input is read and decrypted + * from the file descriptor given by cc and appended to arg_obj, which contains + * the name of the blob to create. The combined buffer is made available to the + * afs process via the callback method. */ static int stdin_command(struct command_context *cc, struct osl_object *arg_obj, - callback_function *f, callback_result_handler *result_handler, - void *private_result_data) + callback_function *f) { struct osl_object query, stdin_obj; int ret; @@ -464,7 +453,7 @@ static int stdin_command(struct command_context *cc, struct osl_object *arg_obj, memcpy((char *)query.data + arg_obj->size, stdin_obj.data, stdin_obj.size); free(stdin_obj.data); - ret = send_callback_request(f, &query, result_handler, private_result_data); + ret = send_callback_request(f, &query, afs_cb_result_handler, cc); free(query.data); return ret; } @@ -479,7 +468,7 @@ static int com_addblob(callback_function *f, struct command_context *cc) return -E_BLOB_SYNTAX; arg_obj.size = strlen(cc->argv[1]) + 1; arg_obj.data = (char *)cc->argv[1]; - return stdin_command(cc, &arg_obj, f, afs_cb_result_handler, cc); + return stdin_command(cc, &arg_obj, f); } static void com_mvblob_callback(struct osl_table *table, int fd, -- 2.39.2