Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 22, 2017
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
8 changes: 4 additions & 4 deletions metadata_exporter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion metadata_input_gps_nsb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down