summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--devtools/README4
-rwxr-xr-xdevtools/cov-scan57
-rw-r--r--libgpsd_core.c1
-rw-r--r--ntpshm.c2
4 files changed, 2 insertions, 62 deletions
diff --git a/devtools/README b/devtools/README
index 22b44f6d..c475e54e 100644
--- a/devtools/README
+++ b/devtools/README
@@ -18,10 +18,6 @@ list of AIS types.
Generate an asciidoc table of the six-bit encoding used in AIVDM packets.
-== cov-scan ==
-
-Prepare a Coverity self-build of the project.
-
== cycle_analyzer ==
Finds end-of-cycle sentences from GPS output logs.
diff --git a/devtools/cov-scan b/devtools/cov-scan
deleted file mode 100755
index 587a9211..00000000
--- a/devtools/cov-scan
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/sh
-#
-# Perform a Coverity self-build on the GPSD code.
-# The build tool gets confused if you try to run it direct from scons.
-#
-# Where the Coverity tools live
-PATH=$PATH:/usr/local/coverity/bin
-#
-# scp destination to drop tarball, can be anywhere web-accessible
-DROP_SCP=esr@login.ibiblio.org:/public/html/catb/esr
-#
-# Public URL for the drop destination
-DROP_HTML=http://catb.org/~esr
-#
-# Things we can deduce
-name=`git config user.name`
-email=`git config user.email`
-#
-# Things that are fixed
-project=gpsd
-password=v2tradeC
-prebuild="scons -c"
-build="scons"
-
-# Nothing below this line should require configuration
-
-echo "Rebuilding and scanning..."
-$prebuild
-rm -fr cov-int
-cov-build --dir cov-int $build
-
-echo "Bundling up required metadata..."
-cat >/tmp/README <<EOF
-Name: $name
-Email: $email
-Project: $project
-EOF
-mv cov-int /tmp;
-(cd /tmp; tar -czf project-scan.tgz README cov-int; rm -fr cov-int)
-
-echo "Uploading to where it's publicly visible..."
-scp /tmp/project-scan.tgz $DROP_SCP; rm /tmp/project-scan.tgz
-url=$DROP_HTML/project-scan.tgz
-
-echo "Post $url to http://scan.coverity.com/submit.html"
-
-: echo "Posting the analysis request..."
-# Simulates the form at http://scan.coverity.com/submit.html
-# Sadly, this doesn't work yet - probably needs login context
-: curl \
- -d project=$project \
- -d password=$password \
- -d email=$email \
- -d url=$url \
- http://scan5.coverity.com/cgi-bin/submit_build.py
-: echo "Done. You'll get mail."
-
diff --git a/libgpsd_core.c b/libgpsd_core.c
index 95da9fa9..2370024d 100644
--- a/libgpsd_core.c
+++ b/libgpsd_core.c
@@ -953,6 +953,7 @@ gps_mask_t gpsd_poll(struct gps_device_t *session)
/* can we get a full packet from the device? */
if (session->device_type != NULL) {
newlen = session->device_type->get_packet(session);
+ /* coverity[deref_ptr] */
gpsd_report(LOG_RAW,
"%s is known to be %s\n",
session->gpsdata.dev.path,
diff --git a/ntpshm.c b/ntpshm.c
index bb41e348..3d08e128 100644
--- a/ntpshm.c
+++ b/ntpshm.c
@@ -912,7 +912,7 @@ static /*@null@*/ void *gpsd_ppsmonitor(void *arg)
}
gpsd_report(LOG_PROG, "PPS gpsd_ppsmonitor exited???\n");
/* pacify Coverity - falling through here is theoretically a handle leak */
- if (chronyfd)
+ if (chronyfd != -1)
(void)close(chronyfd);
return NULL;
}