From ad000735ff8f45b574ae54d02ae0e32c1d4f0f6f Mon Sep 17 00:00:00 2001
From: Matt Goodall <matt.goodall@gmail.com>
Date: Fri, 6 Jul 2012 11:14:11 +0100
Subject: [PATCH] Move flag vars out of main().

---
 client.go    | 18 +++++++++---------
 component.go | 17 ++++++++---------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/client.go b/client.go
index 61b944d..9c05376 100644
--- a/client.go
+++ b/client.go
@@ -6,18 +6,18 @@ import (
 	"xmpp"
 )
 
+var (
+	jid      = flag.String("j", "", "JID")
+	password = flag.String("p", "", "Password")
+)
+
 func main() {
-
-	jid := flag.String("jid", "", "JID")
-	password := flag.String("pass", "", "Password")
+	// Parse args.
 	flag.Parse()
+	jid, _ := xmpp.ParseJID(*jid)
+	password := *password
 
-	jid2, err := xmpp.ParseJID(*jid)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	c, err := xmpp.NewClient(jid2, *password, &xmpp.ClientConfig{})
+	c, err := xmpp.NewClient(jid, password, &xmpp.ClientConfig{})
 	if err != nil {
 		log.Fatal(err)
 	}
diff --git a/component.go b/component.go
index 97a150f..ff273a1 100644
--- a/component.go
+++ b/component.go
@@ -6,18 +6,17 @@ import (
 	"xmpp"
 )
 
+var (
+	jid = flag.String("j", "", "JID")
+	secret = flag.String("s", "", "Component secret")
+)
+
 func main() {
-
-	jid := flag.String("jid", "", "JID")
-	secret := flag.String("secret", "", "Component secret")
 	flag.Parse()
+	jid, _ := xmpp.ParseJID(*jid)
+	secret := *secret
 
-	jid2, err := xmpp.ParseJID(*jid)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	c, err := xmpp.NewComponent("localhost:5347", jid2, *secret)
+	c, err := xmpp.NewComponent("localhost:5347", jid, secret)
 	if err != nil {
 		log.Fatal(err)
 	}