summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary E. Miller <gem@rellim.com>2019-02-22 18:29:53 -0800
committerGary E. Miller <gem@rellim.com>2019-02-22 18:29:53 -0800
commit084098d3f93d0ebf6b2060238b5363d68fdee6e2 (patch)
tree4c275f15881b236c3840df33c7953b8fcc76b47c
parent59935603ccb54f12758672f2c077109523aeeaa7 (diff)
downloadgpsd-084098d3f93d0ebf6b2060238b5363d68fdee6e2.tar.gz
deg_to_str(): Change 'nan' to 'n/a'.
To be compatible with existing cgps, etc.
-rw-r--r--gpsdclient.c6
-rw-r--r--tests/test_gpsdclient.c36
2 files changed, 21 insertions, 21 deletions
diff --git a/gpsdclient.c b/gpsdclient.c
index 8b729d85..218d2676 100644
--- a/gpsdclient.c
+++ b/gpsdclient.c
@@ -38,7 +38,7 @@ static struct exportmethod_t exportmethods[] = {
* deg_ddmm : return DD MM.mmmmmm'[suffix]
* deg_ddmmss : return DD MM' SS.sssss"[suffix]
*
- * returns 'nan' for 360 < f or -360 > f
+ * returns 'n/a' for 360 < f or -360 > f
*
* NOTE: 360.0 is rolled over to 0.0
*
@@ -62,7 +62,7 @@ char *deg_to_str2(enum deg_str_type type, double f,
}
if (!isfinite(f) || 360.0 < fabs(f)) {
- (void)strlcpy(buf, "nan", buf_size);
+ (void)strlcpy(buf, "n/a", buf_size);
return buf;
}
@@ -142,7 +142,7 @@ char *deg_to_str2(enum deg_str_type type, double f,
* deg_ddmm : return DD MM.mmmmmm'
* deg_ddmmss : return DD MM' SS.sssss"
*
- * returns 'nan' for 360 < f
+ * returns 'n/a' for 360 < f
*
* NOTE: 360.0 is rolled over to 0.0
*
diff --git a/tests/test_gpsdclient.c b/tests/test_gpsdclient.c
index deda6d2c..8261f2b6 100644
--- a/tests/test_gpsdclient.c
+++ b/tests/test_gpsdclient.c
@@ -114,30 +114,30 @@ struct test tests[] = {
/* 361 */
/* nan because out of range */
{361,
- "nan",
- "nan",
- "nan",
- "nan",
- "nan",
- "nan"},
+ "n/a",
+ "n/a",
+ "n/a",
+ "n/a",
+ "n/a",
+ "n/a"},
/* -361 */
/* nan, just because */
{NANFLAG,
- "nan",
- "nan",
- "nan",
- "nan",
- "nan",
- "nan"},
+ "n/a",
+ "n/a",
+ "n/a",
+ "n/a",
+ "n/a",
+ "n/a"},
/* FP_INFINITE */
/* gcc too 'smart' to let us put a Nan here */
{9999,
- "nan",
- "nan",
- "nan",
- "nan",
- "nan",
- "nan"},
+ "n/a",
+ "n/a",
+ "n/a",
+ "n/a",
+ "n/a",
+ "n/a"},
};