diff options
| author | Gary E. Miller <gem@rellim.com> | 2015-02-02 17:51:32 -0800 |
|---|---|---|
| committer | Gary E. Miller <gem@rellim.com> | 2015-02-02 17:51:32 -0800 |
| commit | d1bcb364c8076e29bd30bb8a07abc02bccac0a58 (patch) | |
| tree | 1d20533830878acd278eaf63b6f23b9780027ee0 /libgpsd_core.c | |
| parent | 7898d2e440049755d24eba8885e82dd3955616ec (diff) | |
| download | gpsd-d1bcb364c8076e29bd30bb8a07abc02bccac0a58.tar.gz | |
More session initialization
Diffstat (limited to 'libgpsd_core.c')
| -rw-r--r-- | libgpsd_core.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/libgpsd_core.c b/libgpsd_core.c index fc11e4a8..adb4bfd1 100644 --- a/libgpsd_core.c +++ b/libgpsd_core.c @@ -324,11 +324,14 @@ void gpsd_init(struct gps_device_t *session, struct gps_context_t *context, /* initialize GPS polling */ { /* clear some times */ - memset(&session->last_fixtime, 0, sizeof(session->last_fixtime)); + memset( (void *)&session->last_fixtime, 0, sizeof(session->last_fixtime)); #ifdef PPS_ENABLE - memset(&session->ppslast, 0, sizeof(session->ppslast)); + memset( (void *)&session->ppslast, 0, sizeof(session->ppslast)); session->ppscount = 0; #endif /* PPS_ENABLE */ +#if defined(HAVE_SYS_TIMEPPS_H) + session->kernelpps_handle = -1; +#endif /* defined(HAVE_SYS_TIMEPPS_H) */ /*@ -mayaliasunique @*/ if (device != NULL) @@ -419,11 +422,11 @@ void gpsd_clear(struct gps_device_t *session) session->badcount = 0; /* clear the private data union */ - memset(&session->driver, '\0', sizeof(session->driver)); + memset( (void *)&session->driver, '\0', sizeof(session->driver)); /* clear some times */ - memset(&session->last_fixtime, 0, sizeof(session->last_fixtime)); + memset( (void *)&session->last_fixtime, 0, sizeof(session->last_fixtime)); #ifdef PPS_ENABLE - memset(&session->ppslast, 0, sizeof(session->ppslast)); + memset( (void *)&session->ppslast, 0, sizeof(session->ppslast)); session->ppscount = 0; #endif /* PPS_ENABLE */ |