From 5269028f236385dbbdf3d07cda3b4ae7fe1c35dc Mon Sep 17 00:00:00 2001 From: litghost Date: Tue, 24 Sep 2013 20:48:37 -0700 Subject: [PATCH] Pragma's specific to MSVC shouldn't be used --- host/libraries/libbladeRF/src/device_identifier.c | 2 -- host/utilities/bladeRF-cli/src/cmd/cmd.c | 1 - host/utilities/bladeRF-cli/src/cmd/rxtx.c | 1 - 3 files changed, 4 deletions(-) diff --git a/host/libraries/libbladeRF/src/device_identifier.c b/host/libraries/libbladeRF/src/device_identifier.c index 8adb88b8..2dce8d76 100644 --- a/host/libraries/libbladeRF/src/device_identifier.c +++ b/host/libraries/libbladeRF/src/device_identifier.c @@ -133,7 +133,6 @@ static int next_arg(char **saveptr, char **arg, char **value) } /* Argument name */ -#pragma warning(suppress: 6001) // saveptr_local is an out argument from strtok_r, so if strtok_r doesn't return null *arg = strtok_r(token, "=", &saveptr_local); if (!*arg) { @@ -173,7 +172,6 @@ int str2devinfo(const char *dev_id_const, struct bladerf_devinfo *d) } /* Extract backend */ -#pragma warning(suppress: 6001) // saveptr_local is an out argument from strtok_r, so if strtok_r doesn't return null token = strtok_r(dev_id, ":", &saveptr); /* We require a valid backend -- args only is not supported */ diff --git a/host/utilities/bladeRF-cli/src/cmd/cmd.c b/host/utilities/bladeRF-cli/src/cmd/cmd.c index 37a5765d..0a705d00 100644 --- a/host/utilities/bladeRF-cli/src/cmd/cmd.c +++ b/host/utilities/bladeRF-cli/src/cmd/cmd.c @@ -453,7 +453,6 @@ int cmd_handle(struct cli_state *s, const char *line_) argc = 0; ret = 0; -#pragma warning(suppress: 6001) // saveptr is an out argument from strtok_r, so if strtok_r doesn't return null token = strtok_r(line, " \t\r\n", &saveptr); /* Fill argv as long as we see tokens that aren't comments */ diff --git a/host/utilities/bladeRF-cli/src/cmd/rxtx.c b/host/utilities/bladeRF-cli/src/cmd/rxtx.c index 1e1b7085..cc3d1fa8 100644 --- a/host/utilities/bladeRF-cli/src/cmd/rxtx.c +++ b/host/utilities/bladeRF-cli/src/cmd/rxtx.c @@ -487,7 +487,6 @@ static int tx_csv_to_sc16q12(struct cli_state *s) while (fgets(buff, sizeof(buff), tx->common.file)) { /* I */ -#pragma warning(suppress: 6001) // saveptr is an out argument from strtok_r, so if strtok_r doesn't return null token = strtok_r(buff, delim, &saveptr); if (token) {