afs: Rename callback_function to afs_callback.

The new name is more descriptive, and shorter. Pure rename commit,
no real changes.

diff --git a/afs.c b/afs.c
index c6ecbecf02795558d155ad99f50882d2782462a3..fa750d21c2424e1beb3e08a42226e54c5feff40d 100644 (file)
--- a/afs.c
+++ b/afs.c
@@ -130,7 +130,7 @@ extern uint32_t afs_socket_cookie;
  */
 struct callback_query {
        /** The function to be called. */
  */
 struct callback_query {
        /** The function to be called. */

-       callback_function *handler;
+       afs_callback *handler;

        /** The number of bytes of the query */
        size_t query_size;
 };
        /** The number of bytes of the query */
        size_t query_size;
 };


@@ -201,7 +201,7 @@ static int dispatch_result(int result_shmid, callback_result_handler *handler,
  *
  * \sa send_option_arg_callback_request(), send_standard_callback_request().
  */
  *
  * \sa send_option_arg_callback_request(), send_standard_callback_request().
  */

-int send_callback_request(callback_function *f, struct osl_object *query,
+int send_callback_request(afs_callback *f, struct osl_object *query,

                callback_result_handler *result_handler,
                void *private_result_data)
 {
                callback_result_handler *result_handler,
                void *private_result_data)
 {


@@ -299,7 +299,7 @@ out:
  * \sa send_standard_callback_request(), send_callback_request().
  */
 int send_option_arg_callback_request(struct osl_object *options,
  * \sa send_standard_callback_request(), send_callback_request().
  */
 int send_option_arg_callback_request(struct osl_object *options,

-               int argc,  char * const * const argv, callback_function *f,
+               int argc,  char * const * const argv, afs_callback *f,

                callback_result_handler *result_handler,
                void *private_result_data)
 {
                callback_result_handler *result_handler,
                void *private_result_data)
 {


@@ -341,7 +341,7 @@ int send_option_arg_callback_request(struct osl_object *options,
  * send_option_arg_callback_request().
  */
 int send_standard_callback_request(int argc,  char * const * const argv,
  * send_option_arg_callback_request().
  */
 int send_standard_callback_request(int argc,  char * const * const argv,

-               callback_function *f, callback_result_handler *result_handler,
+               afs_callback *f, callback_result_handler *result_handler,

                void *private_result_data)
 {
        return send_option_arg_callback_request(NULL, argc, argv, f, result_handler,
                void *private_result_data)
 {
        return send_option_arg_callback_request(NULL, argc, argv, f, result_handler,

diff --git a/afs.h b/afs.h
index 78bc50aeaadf124165aa3d7e50440b59dea3b9ee..fb704046caafe3ae09008ab53c0437ba73137bc6 100644 (file)
--- a/afs.h
+++ b/afs.h
@@ -166,7 +166,7 @@ struct pattern_match_data {
  *
  * \sa send_callback_request().
  */
  *
  * \sa send_callback_request().
  */

-typedef int callback_function(int fd, const struct osl_object *);
+typedef int afs_callback(int fd, const struct osl_object *);

 
 /**
  * Callbacks send chunks to data back to the command handler. Pointers to
 
 /**
  * Callbacks send chunks to data back to the command handler. Pointers to


@@ -211,15 +211,15 @@ _static_inline_ int afs_max_size_handler(char *buf, size_t size, void *private)
 __noreturn void afs_init(uint32_t cookie, int socket_fd);
 __must_check int afs_event(enum afs_events event, struct para_buffer *pb,
        void *data);
 __noreturn void afs_init(uint32_t cookie, int socket_fd);
 __must_check int afs_event(enum afs_events event, struct para_buffer *pb,
        void *data);

-int send_callback_request(callback_function *f, struct osl_object *query,
+int send_callback_request(afs_callback *f, struct osl_object *query,

                callback_result_handler *result_handler,
                void *private_result_data);
 int send_option_arg_callback_request(struct osl_object *options,
                callback_result_handler *result_handler,
                void *private_result_data);
 int send_option_arg_callback_request(struct osl_object *options,

-               int argc,  char * const * const argv, callback_function *f,
+               int argc,  char * const * const argv, afs_callback *f,

                callback_result_handler *result_handler,
                void *private_result_data);
 int send_standard_callback_request(int argc,  char * const * const argv,
                callback_result_handler *result_handler,
                void *private_result_data);
 int send_standard_callback_request(int argc,  char * const * const argv,

-               callback_function *f, callback_result_handler *result_handler,
+               afs_callback *f, callback_result_handler *result_handler,

                void *private_result_data);
 int string_compare(const struct osl_object *obj1, const struct osl_object *obj2);
 int for_each_matching_row(struct pattern_match_data *pmd);
                void *private_result_data);
 int string_compare(const struct osl_object *obj1, const struct osl_object *obj2);
 int for_each_matching_row(struct pattern_match_data *pmd);

diff --git a/blob.c b/blob.c
index 1360963e6b6ef16d235972a150faf6dcb7ae64fe..33a6f63ba29a9bf8b0056d64e567972fab4b853a 100644 (file)
--- a/blob.c
+++ b/blob.c
@@ -171,7 +171,7 @@ out:
        return ret;
 }
 
        return ret;
 }
 

-static int com_lsblob(callback_function *f, struct command_context *cc)
+static int com_lsblob(afs_callback *f, struct command_context *cc)

 {
        uint32_t flags = 0;
        struct osl_object options = {.data = &flags, .size = sizeof(flags)};
 {
        uint32_t flags = 0;
        struct osl_object options = {.data = &flags, .size = sizeof(flags)};


@@ -241,7 +241,7 @@ static int com_catblob_callback(struct osl_table *table, int fd,
        return ret;
 }
 
        return ret;
 }
 

-static int com_catblob(callback_function *f, struct command_context *cc)
+static int com_catblob(afs_callback *f, struct command_context *cc)

 {
        if (cc->argc < 2)
                return -E_BLOB_SYNTAX;
 {
        if (cc->argc < 2)
                return -E_BLOB_SYNTAX;


@@ -296,7 +296,7 @@ out:
        return ret;
 }
 
        return ret;
 }
 

-static int com_rmblob(callback_function *f, struct command_context *cc)
+static int com_rmblob(afs_callback *f, struct command_context *cc)

 {
        if (cc->argc < 2)
                return -E_MOOD_SYNTAX;
 {
        if (cc->argc < 2)
                return -E_MOOD_SYNTAX;


@@ -428,7 +428,7 @@ again:
  * afs process via the callback method.
  */
 static int stdin_command(struct command_context *cc, struct osl_object *arg_obj,
  * afs process via the callback method.
  */
 static int stdin_command(struct command_context *cc, struct osl_object *arg_obj,

-               callback_function *f)
+               afs_callback *f)

 {
        struct osl_object query, stdin_obj;
        int ret;
 {
        struct osl_object query, stdin_obj;
        int ret;


@@ -451,7 +451,7 @@ static int stdin_command(struct command_context *cc, struct osl_object *arg_obj,
        return ret;
 }
 
        return ret;
 }
 

-static int com_addblob(callback_function *f, struct command_context *cc)
+static int com_addblob(afs_callback *f, struct command_context *cc)

 {
        struct osl_object arg_obj;
 
 {
        struct osl_object arg_obj;
 


@@ -495,7 +495,7 @@ out:
        return ret;
 }
 
        return ret;
 }
 

-static int com_mvblob(callback_function *f, struct command_context *cc)
+static int com_mvblob(afs_callback *f, struct command_context *cc)

 {
        if (cc->argc != 3)
                return -E_MOOD_SYNTAX;
 {
        if (cc->argc != 3)
                return -E_MOOD_SYNTAX;