Factor out a usage() function

diff --git a/tweeper.php b/tweeper.php
index 68b265e..38e77f9 100755 (executable)
--- a/tweeper.php
+++ b/tweeper.php
@@ -73,17 +73,22 @@ class Tweeper {
   }
 }
 
   }
 }
 

-if (isset($_GET['screen_name'])) {
-  $screen_name = $_GET['screen_name'];
-} else if (isset($argv[1])) {
-  $screen_name = $argv[1];
-} else {
+function usage($argv)
+{

   if (php_sapi_name() != 'cli')
     $usage = htmlentities("{$_SERVER['SCRIPT_NAME']}?screen_name=<screen_name>");
   else
     $usage = "{$argv[0]} <screen_name>\n";
 
   if (php_sapi_name() != 'cli')
     $usage = htmlentities("{$_SERVER['SCRIPT_NAME']}?screen_name=<screen_name>");
   else
     $usage = "{$argv[0]} <screen_name>\n";
 

-  die("usage: $usage");
+  return "usage: $usage";
+}
+
+if (isset($_GET['screen_name'])) {
+  $screen_name = $_GET['screen_name'];
+} else if (isset($argv[1])) {
+  $screen_name = $argv[1];
+} else {
+  die(usage($argv));

 }
 
 $tweeper = new Tweeper('twitter_user_timeline2rss.xsl');
 }
 
 $tweeper = new Tweeper('twitter_user_timeline2rss.xsl');