serve.[ch]: don't pass "struct strvec *keys" to commands

The serve.c API added in ed10cb952d3 (serve: introduce git-serve,
2018-03-15) was passing in the raw capabilities "keys", but nothing
downstream of it ever used them.

Let's remove that code because it's not needed. If we do end up
needing to pass information about the advertisement in the future
it'll make more sense to have serve.c parse the capabilities keys and
pass the result of its parsing, rather than expecting expecting its
API users to parse the same keys again.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/ls-refs.c b/ls-refs.c
index 88f6c3f..a1a0250 100644 (file)
--- a/ls-refs.c
+++ b/ls-refs.c
@@ -138,8 +138,7 @@ static int ls_refs_config(const char *var, const char *value, void *data)
        return parse_hide_refs_config(var, value, "uploadpack");
 }
 
-int ls_refs(struct repository *r, struct strvec *keys,
-           struct packet_reader *request)
+int ls_refs(struct repository *r, struct packet_reader *request)
 {
        struct ls_refs_data data;
 

diff --git a/ls-refs.h b/ls-refs.h
index a99e4be..e2243a5 100644 (file)
--- a/ls-refs.h
+++ b/ls-refs.h
@@ -2,10 +2,8 @@
 #define LS_REFS_H
 
 struct repository;
-struct strvec;
 struct packet_reader;
-int ls_refs(struct repository *r, struct strvec *keys,
-           struct packet_reader *request);
+int ls_refs(struct repository *r, struct packet_reader *request);
 int ls_refs_advertise(struct repository *r, struct strbuf *value);
 
 #endif /* LS_REFS_H */

diff --git a/protocol-caps.c b/protocol-caps.c
index 13a9e63..4b345c5 100644 (file)
--- a/protocol-caps.c
+++ b/protocol-caps.c
@@ -74,8 +74,7 @@ static void send_info(struct repository *r, struct packet_writer *writer,
        }
 }
 
-int cap_object_info(struct repository *r, struct strvec *keys,
-                   struct packet_reader *request)
+int cap_object_info(struct repository *r, struct packet_reader *request)
 {
        struct requested_info info;
        struct packet_writer writer;

diff --git a/protocol-caps.h b/protocol-caps.h
index 0a9f49d..15c4550 100644 (file)
--- a/protocol-caps.h
+++ b/protocol-caps.h
@@ -2,9 +2,7 @@
 #define PROTOCOL_CAPS_H
 
 struct repository;
-struct strvec;
 struct packet_reader;
-int cap_object_info(struct repository *r, struct strvec *keys,
-                   struct packet_reader *request);
+int cap_object_info(struct repository *r, struct packet_reader *request);
 
 #endif /* PROTOCOL_CAPS_H */

diff --git a/serve.c b/serve.c
index 33d00c8..967bf17 100644 (file)
--- a/serve.c
+++ b/serve.c
@@ -60,16 +60,13 @@ struct protocol_capability {
 
        /*
         * Function called when a client requests the capability as a command.
-        * The function will be provided the capabilities requested via 'keys'
-        * as well as a struct packet_reader 'request' which the command should
+        * Will be provided a struct packet_reader 'request' which it should
         * use to read the command specific part of the request.  Every command
         * MUST read until a flush packet is seen before sending a response.
         *
         * This field should be NULL for capabilities which are not commands.
         */
-       int (*command)(struct repository *r,
-                      struct strvec *keys,
-                      struct packet_reader *request);
+       int (*command)(struct repository *r, struct packet_reader *request);
 };
 
 static struct protocol_capability capabilities[] = {
@@ -294,7 +291,7 @@ static int process_request(void)
        if (has_capability(&keys, "session-id", &client_sid))
                trace2_data_string("transfer", NULL, "client-sid", client_sid);
 
-       command->command(the_repository, &keys, &reader);
+       command->command(the_repository, &reader);
 
        strvec_clear(&keys);
        return 0;

diff --git a/upload-pack.c b/upload-pack.c
index 297b76f..ed60a9a 100644 (file)
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -1655,8 +1655,7 @@ enum fetch_state {
        FETCH_DONE,
 };
 
-int upload_pack_v2(struct repository *r, struct strvec *keys,
-                  struct packet_reader *request)
+int upload_pack_v2(struct repository *r, struct packet_reader *request)
 {
        enum fetch_state state = FETCH_PROCESS_ARGS;
        struct upload_pack_data data;

diff --git a/upload-pack.h b/upload-pack.h
index 27ddcdc..63e3252 100644 (file)
--- a/upload-pack.h
+++ b/upload-pack.h
@@ -11,10 +11,8 @@ struct upload_pack_options {
 void upload_pack(struct upload_pack_options *options);
 
 struct repository;
-struct strvec;
 struct packet_reader;
-int upload_pack_v2(struct repository *r, struct strvec *keys,
-                  struct packet_reader *request);
+int upload_pack_v2(struct repository *r, struct packet_reader *request);
 
 struct strbuf;
 int upload_pack_advertise(struct repository *r,