From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 23 Jul 2019 14:27:51 +0000 (+0100)
Subject: dgit: Move $data check into api_query
X-Git-Tag: archive/debian/9.6~17
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=49057372811e0d8f1f3cf856a3056dfe49e9139f;p=dgit.git

dgit: Move $data check into api_query

In support of #932570.  Our intended other caller doesn't have a
$data.  No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/dgit b/dgit
index 80adf1fd..ed6827bc 100755
--- a/dgit
+++ b/dgit
@@ -1223,10 +1223,8 @@ sub archive_api_query_cmd ($) {
     return @cmd;
 }
 
-sub api_query_raw ($$;$) {
-    my ($data, $subpath, $ok404) = @_;
-    badcfg __ "ftpmasterapi archive query method takes no data part"
-	if length $data;
+sub api_query_raw ($;$) {
+    my ($subpath, $ok404) = @_;
     my @cmd = archive_api_query_cmd($subpath);
     my $url = $cmd[$#cmd];
     push @cmd, qw(-w %{http_code});
@@ -1245,7 +1243,9 @@ sub api_query_raw ($$;$) {
 sub api_query ($$;$) {
     my ($data, $subpath, $ok404) = @_;
     use JSON;
-    my $json = api_query_raw $data, $subpath, $ok404;
+    badcfg __ "ftpmasterapi archive query method takes no data part"
+	if length $data;
+    my $json = api_query_raw $subpath, $ok404;
     return undef unless defined $json;
     return decode_json($json);
 }