From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Thu, 30 Dec 2010 22:05:25 +0000 (-0500)
Subject: more cleanup of the usage function to make it easier to edit, and maybe invoke elsewhere.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d0b1f4100d29ddbff9e23054b6d8926d86a11efc;p=monkeysphere-validation-agent.git

more cleanup of the usage function to make it easier to edit, and maybe invoke elsewhere.
---

diff --git a/msva-query-agent b/msva-query-agent
index ef8a2d4..be08531 100755
--- a/msva-query-agent
+++ b/msva-query-agent
@@ -21,13 +21,20 @@ use strict;
 
 use Crypt::Monkeysphere::MSVA::Client;
 
+sub usage {
+  my $name = shift;
+
+  printf STDERR ("Usage: %s CONTEXT PEER PKC_TYPE [PEER_TYPE] < PKC_DATA
+       %s CONTEXT PEER PKC_TYPE PEER_TYPE PKC_DATA
+       %s --version
+", $name, $name, $name);
+}
+
 my $context = shift;
 if ((!defined($context)) ||
     $context eq '--help') {
-  printf STDERR "Usage: msva-query-agent CONTEXT PEER PKC_TYPE [PEER_TYPE] <PKC_DATA\n";
-  printf STDERR "       msva-query-agent CONTEXT PEER PKC_TYPE PEER_TYPE PKC_DATA\n";
-  printf STDERR "       msva-query-agent --version\n";
-  exit 0;
+  usage($0);
+  exit (defined($context) ? 0 : 1);
 } elsif ($context eq '--version') {
   my $client = Crypt::Monkeysphere::MSVA::Client->new(
 						      socket => $ENV{MONKEYSPHERE_VALIDATION_AGENT_SOCKET},