Apply Lonnie Mendez patches to fix my gpsd mistakes.

Also allow gpsd to compile w/o GARMIN_ENABLE.

3 files changed, 4 insertions, 2 deletions

diff --git a/cgps.c b/cgps.c
index 2b9d8fa0..3c094b63 100644
--- a/cgps.c
+++ b/cgps.c
@@ -259,7 +259,7 @@ int main(int argc, char *argv[])
 		    deg_type = deg_ddmmss;
 		    break;
             default:
-		    (void)fprintf(stderr, "Unknown -l argument: %c\n", optarg);
+		    (void)fprintf(stderr, "Unknown -l argument: %s\n", optarg);
 	            usage( argv[0] );
 		    break;
             }
diff --git a/libgps.c b/libgps.c
index 7ed91a0a..4fb8a1cb 100644
--- a/libgps.c
+++ b/libgps.c
@@ -40,7 +40,7 @@ char *deg_to_str( enum deg_str_type type,  double f)
 
 	if ( deg_dd == type ) {
 		/* DD.dddddd */
-		(void)sprintf( str, "%3d.%06d", deg, frac_deg );
+		(void)sprintf( str, "%3d.%06ld", deg, frac_deg );
 		return str;
 	}
 	fsec = modf( fmin * 60, &fmin);
diff --git a/libgpsd_core.c b/libgpsd_core.c
index b61baa23..2697daa4 100644
--- a/libgpsd_core.c
+++ b/libgpsd_core.c
@@ -612,6 +612,7 @@ gps_mask_t gpsd_poll(struct gps_device_t *session)
 			  (sizeof(buf2)-strlen(buf2)));
 	    else
 #endif /* RTCM104_ENABLE */
+#ifdef BINARY_ENABLE
 	    if ((session->gpsdata.set & LATLON_SET) != 0)
 		gpsd_binary_fix_dump(session, 
 				     buf2+strlen(buf2), 
@@ -624,6 +625,7 @@ gps_mask_t gpsd_poll(struct gps_device_t *session)
 		gpsd_binary_satellite_dump(session,
 					 buf2 + strlen(buf2),
 					 (sizeof(buf2)-strlen(buf2)));
+#endif /* BINARY_ENABLE */
 	    if (buf2[0] != '\0') {
 		gpsd_report(3, "<= GPS: %s", buf2);
 		if (session->gpsdata.raw_hook)