X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Fao-test-gps%2Fao-test-gps.c;h=09ad3e8cb18bc38b888c9de69812d8bf78a086a0;hp=08b6602f794edb637443051dc47987f5e66c9096;hb=6f729ff46b2f4531db68f0af85e7e9fe0f6d1969;hpb=d0e597789ac298b108ea04cc1a2c999bcf14bc9c

diff --git a/ao-tools/ao-test-gps/ao-test-gps.c b/ao-tools/ao-test-gps/ao-test-gps.c
index 08b6602f..09ad3e8c 100644
--- a/ao-tools/ao-test-gps/ao-test-gps.c
+++ b/ao-tools/ao-test-gps/ao-test-gps.c
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -46,7 +47,7 @@ static void usage(char *program)
 	exit(1);
 }
 
-void
+static void
 done(struct cc_usb *cc, int code)
 {
 /*	cc_usb_printf(cc, "a\n"); */
@@ -54,28 +55,6 @@ done(struct cc_usb *cc, int code)
 	exit (code);
 }
 
-static int
-ends_with(char *whole, char *suffix)
-{
-	int whole_len = strlen(whole);
-	int suffix_len = strlen(suffix);
-
-	if (suffix_len > whole_len)
-		return 0;
-	return strcmp(whole + whole_len - suffix_len, suffix) == 0;
-}
-
-static int
-starts_with(char *whole, char *prefix)
-{
-	int whole_len = strlen(whole);
-	int prefix_len = strlen(prefix);
-
-	if (prefix_len > whole_len)
-		return 0;
-	return strncmp(whole, prefix, prefix_len) == 0;
-}
-
 static char **
 tok(char *line) {
 	char	**strs = malloc (sizeof (char *)), *str;
@@ -139,16 +118,15 @@ free_gps(struct gps *b) {
 	}
 }
 
-char **
+static char **
 find_gps(struct gps *b, char *word0) {
-	int i;
 	for (;b; b = b->next)
 		if (b->strs[0] && !strcmp(b->strs[0], word0))
 			return b->strs;
 	return NULL;
 }
 
-int
+static int
 do_gps(struct cc_usb *usb) {
 	int	count = 0;
 
@@ -160,6 +138,7 @@ do_gps(struct cc_usb *usb) {
 		int actual_sats = strtol(sats[1], NULL, 0);
 
 		if (actual_flags & (1 << 4)) {
+			printf("\n");
 			printf("Flags: %s (0x%x)\n", flags[1], actual_flags);
 			printf("Sats: %s (%d)\n", sats[1], actual_sats);
 			break;
@@ -184,15 +163,9 @@ int
 main (int argc, char **argv)
 {
 	char			*device = NULL;
-	char			*filename;
-	Elf			*e;
-	unsigned int		s;
-	int			i;
 	int			c;
-	int			tries;
 	struct cc_usb		*cc = NULL;
 	char			*tty = NULL;
-	int			success;
 	int			verbose = 0;
 	int			ret = 0;