m

Signed-off-by: Mattias Andrée <maandree@kth.se>

9 files changed, 12 insertions, 10 deletions

diff --git a/get-contact-chats.c b/get-contact-chats.c
index 4d25d66..5e790d7 100644
--- a/get-contact-chats.c
+++ b/get-contact-chats.c
@@ -8,10 +8,10 @@ int
 main(int argc, char *argv[])
 {
 	int display_ctx = 0, display_addr = 0, display_srv = 0;
+	const char *lookup_ctx = NULL, *lookup_addr = NULL, *lookup_srv = NULL;
 	struct passwd *user;
 	struct libcontacts_contact contact;
 	struct libcontacts_chat **chats, *chat;
-	const char *lookup_ctx = NULL, *lookup_addr = NULL, *lookup_srv = NULL;
 	int ret = 0;
 	size_t i;
 
diff --git a/get-contact-emails.c b/get-contact-emails.c
index 1e688f6..a672b0a 100644
--- a/get-contact-emails.c
+++ b/get-contact-emails.c
@@ -8,10 +8,10 @@ int
 main(int argc, char *argv[])
 {
 	int display_ctx = 0, display_addr = 0;
+	const char *lookup_ctx = NULL, *lookup_addr = NULL;
 	struct passwd *user;
 	struct libcontacts_contact contact;
 	struct libcontacts_email **emails, *email;
-	const char *lookup_ctx = NULL, *lookup_addr = NULL;
 	int ret = 0;
 	size_t i;
 
diff --git a/get-contact-gender.c b/get-contact-gender.c
index 32fef81..a4634fb 100644
--- a/get-contact-gender.c
+++ b/get-contact-gender.c
@@ -7,9 +7,10 @@ USAGE("[-f] contact-id ...");
 int
 main(int argc, char *argv[])
 {
+	int output_flag = 0;
 	struct passwd *user;
 	struct libcontacts_contact contact;
-	int output_flag = 0, ret = 0;
+	int ret = 0;
 	size_t i;
 
 	ARGBEGIN {
diff --git a/get-contact-groups.c b/get-contact-groups.c
index fa1eb77..35c898b 100644
--- a/get-contact-groups.c
+++ b/get-contact-groups.c
@@ -8,9 +8,9 @@ int
 main(int argc, char *argv[])
 {
 	int lookup_unassigned = 0;
+	char *lookup_group = NULL;
 	struct passwd *user;
 	struct libcontacts_contact contact;
-	char *lookup_group = NULL;
 	char **groups;
 	int ret = 0;
 	size_t i;
diff --git a/get-contact-name.c b/get-contact-name.c
index 8a0ae0c..72b76c0 100644
--- a/get-contact-name.c
+++ b/get-contact-name.c
@@ -7,10 +7,11 @@ USAGE("[-F | -f | -l | n] contact-id ...");
 int
 main(int argc, char *argv[])
 {
+	size_t offset = 0;
 	struct passwd *user;
 	struct libcontacts_contact contact;
 	int ret = 0;
-	size_t i, offset = 0;
+	size_t i;
 	char *name;
 
 	ARGBEGIN {
diff --git a/get-contact-numbers.c b/get-contact-numbers.c
index 3b032ce..d04c999 100644
--- a/get-contact-numbers.c
+++ b/get-contact-numbers.c
@@ -10,11 +10,11 @@ main(int argc, char *argv[])
 {
 	int display_ctx = 0, display_num = 0, display_type = 0;
 	int require_mobile = -1, require_fax = -1;
+	const char *lookup_ctx = NULL, *lookup_num = NULL;
+	const char *cc_contacts = NULL, *cc_location = NULL;
 	struct passwd *user;
 	struct libcontacts_contact contact;
 	struct libcontacts_number **numbers, *number;
-	const char *lookup_ctx = NULL, *lookup_num = NULL;
-	const char *cc_contacts = NULL, *cc_location = NULL;
 	int ret = 0;
 	size_t i;
 
diff --git a/get-contact-organisations.c b/get-contact-organisations.c
index ae236db..92be776 100644
--- a/get-contact-organisations.c
+++ b/get-contact-organisations.c
@@ -8,10 +8,10 @@ int
 main(int argc, char *argv[])
 {
 	int display_org = 0, display_title = 0;
+	const char *lookup_org = NULL, *lookup_title = NULL;
 	struct passwd *user;
 	struct libcontacts_contact contact;
 	struct libcontacts_organisation **orgs, *org;
-	const char *lookup_org = NULL, *lookup_title = NULL;
 	int ret = 0;
 	size_t i;
 
diff --git a/get-contact-pgpkeys.c b/get-contact-pgpkeys.c
index 97e32c7..e0a3961 100644
--- a/get-contact-pgpkeys.c
+++ b/get-contact-pgpkeys.c
@@ -8,10 +8,10 @@ int
 main(int argc, char *argv[])
 {
 	int display_ctx = 0, display_id = 0;
+	const char *lookup_ctx = NULL, *lookup_id = NULL;
 	struct passwd *user;
 	struct libcontacts_contact contact;
 	struct libcontacts_pgpkey **keys, *key;
-	const char *lookup_ctx = NULL, *lookup_id = NULL;
 	int ret = 0;
 	size_t i;
 
diff --git a/get-contact-sites.c b/get-contact-sites.c
index a46eadc..4bd53e6 100644
--- a/get-contact-sites.c
+++ b/get-contact-sites.c
@@ -8,10 +8,10 @@ int
 main(int argc, char *argv[])
 {
 	int display_ctx = 0, display_addr = 0;
+	const char *lookup_ctx = NULL, *lookup_addr = NULL;
 	struct passwd *user;
 	struct libcontacts_contact contact;
 	struct libcontacts_site **sites, *site;
-	const char *lookup_ctx = NULL, *lookup_addr = NULL;
 	int ret = 0;
 	size_t i;