Merge pull request #34 from MONROE-PROJECT/kristrev/fix/gps-nsb

s/nsb_gps/gps_nsb/g, fixes help and ifdef

Author: kristrev

CMakeLists.txt

@@ -88,7 +88,7 @@ endif()
 if (GPS_NSB)
     set(SOURCE ${SOURCE}
         metadata_input_gps_nsb.c)
-    add_definitions("-DNSB_GPS")
+    add_definitions("-DGPS_NSB_SUPPORT")
 endif()
 
 set(CPACK_GENERATOR "DEB")

metadata_exporter.c

@@ -50,7 +50,7 @@
 #ifdef SYSEVENT_SUPPORT
     #include "metadata_input_sysevent.h"
 #endif
-#ifdef NSB_GPS
+#ifdef GPS_NSB_SUPPORT
     #include "metadata_input_gps_nsb.h"
 #endif
 #include "metadata_input_netlink.h"
@@ -668,8 +668,8 @@ static void print_usage()
 #ifdef MUNIN_SUPPORT
     md_munin_usage();
 #endif
-#ifdef NSB_GPS_SUPPORT
-    md_nsp_gps_usage();
+#ifdef GPS_NSB_SUPPORT
+    md_gps_nsb_usage();
 #endif
 #ifdef SYSEVENT_SUPPORT
     md_sysevent_usage();
@@ -771,7 +771,7 @@ int main(int argc, char *argv[])
             md_netlink_setup(mde, (struct md_input_netlink*) mde->md_inputs[MD_INPUT_NETLINK]);
             num_inputs++;
         }
-#ifdef NSB_GPS
+#ifdef GPS_NSB_SUPPORT
         else if (!strcmp(key, "gps_nsb")) {
             mde->md_inputs[MD_INPUT_GPS_NSB] = calloc(sizeof(struct md_input_gps_nsb), 1);
 

metadata_input_gps_nsb.c

@@ -158,7 +158,7 @@ static uint8_t md_input_gps_nsb_init(void *ptr, json_object* config)
 
 void md_gps_nsb_usage()
 {
-    fprintf(stderr, "\"nsp_gps\": {\t\tNSB GPS input\n");
+    fprintf(stderr, "\"gps_nsb\": {\t\tNSB GPS input\n");
     fprintf(stderr, "  \"address\":\t\tIP NSB broadcasts GPS to\n");
     fprintf(stderr, "  \"port\":\t\tPort NSB broadcasts GPS to\n");
     fprintf(stderr, "},\n");