Bride of the Splint Cleanup. All regression tests pass.

1 files changed, 12 insertions, 8 deletions

diff --git a/gps_json.h b/gps_json.h
index 2f27900e..39c99da1 100644
--- a/gps_json.h
+++ b/gps_json.h
@@ -6,15 +6,19 @@
 #define GPS_JSON_RESPONSE_MAX	1024
 
 char *json_stringify(/*@out@*/char *, size_t, /*@in@*/const char *);
-int json_watch_read(const char *, struct policy_t *, /*@null@*/const char **);
-int json_device_read(const char *, struct devconfig_t *, /*@null@*/const char **);
+void json_tpv_dump(const struct gps_data_t *, struct gps_fix_t *, char *, size_t);
+void json_sky_dump(const struct gps_data_t *, char *, size_t);
+void json_device_dump(const struct gps_device_t *, char *, size_t);
+void json_watch_dump(const struct policy_t *, char *, size_t);
+int json_watch_read(const char *, /*@out@*/struct policy_t *, 
+		    /*@out null@*/const char **);
+int json_device_read(const char *, /*@out@*/struct devconfig_t *, 
+		     /*@out null@*/const char **);
 void json_version_dump(/*@out@*/char *, size_t);
-void json_tpv_dump(struct gps_data_t *, struct gps_fix_t *, char *, size_t);
-void json_sky_dump(struct gps_data_t *, char *, size_t);
-void json_device_dump(struct gps_device_t *, char *, size_t);
-void json_watch_dump(struct policy_t *, char *, size_t);
-int json_rtcm2_read(const char *, char *, size_t, struct rtcm2_t *, /*@null@*/const char **);
-int json_ais_read(const char *, char *, size_t, struct ais_t *, /*@null@*/const char **);
+int json_rtcm2_read(const char *, char *, size_t, struct rtcm2_t *, 
+		    /*@out null@*/const char **);
+int json_ais_read(const char *, char *, size_t, struct ais_t *, 
+		  /*@out null@*/const char **);
 int libgps_json_unpack(const char *, struct gps_data_t *);
 
 /* gps_json.h ends here */