Change the type of the argv argument of all commands.

[paraslash.git] / afs.c

diff --git a/afs.c b/afs.c
index e3844e3800d0be8341b5ca18341779a406ef5937..806d0fbd70d199bdd8f515e4511f6224ddfaf856 100644 (file)
--- a/afs.c
+++ b/afs.c
@@ -75,23 +75,6 @@ struct command_task {
  */
 extern uint32_t afs_socket_cookie;
 
-struct callback_data {
-       /** The function to be called. */
-       callback_function *handler;
-       /** The sma for the parameters of the callback function. */
-       int query_shmid;
-       /** The size of the query sma. */
-       size_t query_size;
-       /** If the callback produced a result, it is stored in this sma. */
-       int result_shmid;
-       /** The size of the result sma. */
-       size_t result_size;
-       /** The return value of the callback function. */
-       int callback_ret;
-       /** The return value of the callback() procedure. */
-       int sma_ret;
-};
-
 /**
  * Struct to let command handlers execute a callback in afs context.
  *
@@ -252,7 +235,7 @@ out:
  * \sa send_standard_callback_request(), send_callback_request().
  */
 int send_option_arg_callback_request(struct osl_object *options,
-               int argc, const char **argv, callback_function *f,
+               int argc,  char * const * const argv, callback_function *f,
                struct osl_object *result)
 {
        char *p;
@@ -290,7 +273,7 @@ int send_option_arg_callback_request(struct osl_object *options,
  * \return The return value of the underlying call to
  * send_option_arg_callback_request().
  */
-int send_standard_callback_request(int argc, const char **argv,
+int send_standard_callback_request(int argc,  char * const * const argv,
                callback_function *f, struct osl_object *result)
 {
        return send_option_arg_callback_request(NULL, argc, argv, f, result);
@@ -691,7 +674,7 @@ static void command_post_select(struct sched *s, struct task *t)
                goto out;
        }
        if (t->ret != sizeof(buf)) {
-               PARA_NOTICE_LOG("short read (%d bytes, expected %d)\n",
+               PARA_NOTICE_LOG("short read (%d bytes, expected %lu)\n",
                        t->ret, sizeof(buf));
                t->ret = 1;
                goto out;
@@ -811,7 +794,7 @@ static int create_all_tables(void)
 }
 
 /* TODO load tables after init */
-int com_init(__a_unused int fd, int argc, const char **argv)
+int com_init(__a_unused int fd, int argc, char * const * const argv)
 {
        int i, j, ret;
        if (argc == 1)