From a66ef4fb34dd0b2ac587d52a24e1307211a585e1 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Wed, 14 Aug 2019 00:47:48 +0200 Subject: [PATCH] Apply modernize-redundant-void-arg clang-tidy check --- .clang-tidy | 1 + src/algorithms/libs/rtklib/rtklib_rtkcmn.cc | 9 +++++---- src/algorithms/libs/rtklib/rtklib_rtkcmn.h | 8 ++++---- src/algorithms/libs/rtklib/rtklib_rtkpos.cc | 4 ++-- src/algorithms/libs/rtklib/rtklib_rtkpos.h | 4 ++-- src/algorithms/libs/rtklib/rtklib_rtksvr.cc | 1 + src/algorithms/libs/rtklib/rtklib_stream.cc | 4 ++-- src/algorithms/libs/rtklib/rtklib_stream.h | 4 ++-- src/algorithms/tracking/libs/tracking_loop_filter.cc | 10 +++++----- src/algorithms/tracking/libs/tracking_loop_filter.h | 10 +++++----- 10 files changed, 29 insertions(+), 26 deletions(-) diff --git a/.clang-tidy b/.clang-tidy index eb5a2c37d..9be3857b5 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -33,6 +33,7 @@ Checks: '-*, modernize-loop-convert, modernize-pass-by-value, modernize-raw-string-literal, + modernize-redundant-void-arg, modernize-use-auto, modernize-use-bool-literals, modernize-use-emplace, diff --git a/src/algorithms/libs/rtklib/rtklib_rtkcmn.cc b/src/algorithms/libs/rtklib/rtklib_rtkcmn.cc index d924d3d69..1b2dc6c27 100644 --- a/src/algorithms/libs/rtklib/rtklib_rtkcmn.cc +++ b/src/algorithms/libs/rtklib/rtklib_rtkcmn.cc @@ -1768,7 +1768,7 @@ double timediffweekcrossover(gtime_t t1, gtime_t t2) * args : none * return : current time in utc *-----------------------------------------------------------------------------*/ -gtime_t timeget(void) +gtime_t timeget() { gtime_t time; double ep[6] = {}; @@ -2143,7 +2143,7 @@ int adjgpsweek(int week) * args : none * return : current tick in ms *-----------------------------------------------------------------------------*/ -unsigned int tickget(void) +unsigned int tickget() { struct timespec tp = {0, 0}; struct timeval tv = {0, 0}; @@ -3835,7 +3835,7 @@ unsigned int tick_trace = 0; /* tick time at traceopen (ms) */ gtime_t time_trace = {0, 0.0}; /* time at traceopen */ pthread_mutex_t lock_trace; /* lock for trace */ -void traceswap(void) +void traceswap() { gtime_t time = utc2gpst(timeget()); char path[1024]; @@ -3893,7 +3893,7 @@ void traceopen(const char *file) } -void traceclose(void) +void traceclose() { if (fp_trace && fp_trace != stderr) { @@ -5125,6 +5125,7 @@ int rtk_uncompress(const char *file, char *uncfile) if (strlen(uncfile) < 1025) { std::strncpy(tmpfile, uncfile, 1024); + tmpfile[1023] = '\0'; } stat = 1; } diff --git a/src/algorithms/libs/rtklib/rtklib_rtkcmn.h b/src/algorithms/libs/rtklib/rtklib_rtkcmn.h index ea7a870dc..adf506d5a 100644 --- a/src/algorithms/libs/rtklib/rtklib_rtkcmn.h +++ b/src/algorithms/libs/rtklib/rtklib_rtkcmn.h @@ -174,7 +174,7 @@ double time2bdt(gtime_t t, int *week); gtime_t timeadd(gtime_t t, double sec); double timediff(gtime_t t1, gtime_t t2); double timediffweekcrossover(gtime_t t1, gtime_t t2); -gtime_t timeget(void); +gtime_t timeget(); void timeset(gtime_t t); int read_leaps_text(FILE *fp); int read_leaps_usno(FILE *fp); @@ -189,7 +189,7 @@ void time2str(gtime_t t, char *s, int n); char *time_str(gtime_t t, int n); double time2doy(gtime_t t); int adjgpsweek(int week); -unsigned int tickget(void); +unsigned int tickget(); void sleepms(int ms); void deg2dms(double deg, double *dms, int ndec); void deg2dms(double deg, double *dms); @@ -232,9 +232,9 @@ void freeobs(obs_t *obs); void freenav(nav_t *nav, int opt); void traceopen(const char *file); -void traceclose(void); +void traceclose(); void tracelevel(int level); -void traceswap(void); +void traceswap(); void trace(int level, const char *format, ...); void tracet(int level, const char *format, ...); void tracemat(int level, const double *A, int n, int m, int p, int q); diff --git a/src/algorithms/libs/rtklib/rtklib_rtkpos.cc b/src/algorithms/libs/rtklib/rtklib_rtkpos.cc index aef2ab19a..38c9ce9a6 100644 --- a/src/algorithms/libs/rtklib/rtklib_rtkpos.cc +++ b/src/algorithms/libs/rtklib/rtklib_rtkpos.cc @@ -181,7 +181,7 @@ int rtkopenstat(const char *file, int level) * args : none * return : none *-----------------------------------------------------------------------------*/ -void rtkclosestat(void) +void rtkclosestat() { trace(3, "rtkclosestat:\n"); @@ -341,7 +341,7 @@ void rtkoutstat(rtk_t *rtk, char *buff __attribute__((unused))) /* swap solution status file -------------------------------------------------*/ -void swapsolstat(void) +void swapsolstat() { gtime_t time = utc2gpst(timeget()); char path[1024]; diff --git a/src/algorithms/libs/rtklib/rtklib_rtkpos.h b/src/algorithms/libs/rtklib/rtklib_rtkpos.h index 3cac6b4d0..79d9fe375 100644 --- a/src/algorithms/libs/rtklib/rtklib_rtkpos.h +++ b/src/algorithms/libs/rtklib/rtklib_rtkpos.h @@ -84,11 +84,11 @@ const double TTOL_MOVEB = (1.0 + 2 * DTTOL); int rtkopenstat(const char *file, int level); -void rtkclosestat(void); +void rtkclosestat(); void rtkoutstat(rtk_t *rtk); -void swapsolstat(void); +void swapsolstat(); void outsolstat(rtk_t *rtk); diff --git a/src/algorithms/libs/rtklib/rtklib_rtksvr.cc b/src/algorithms/libs/rtklib/rtklib_rtksvr.cc index 0c7a1d477..63ba80c56 100644 --- a/src/algorithms/libs/rtklib/rtklib_rtksvr.cc +++ b/src/algorithms/libs/rtklib/rtklib_rtksvr.cc @@ -992,6 +992,7 @@ int rtksvrstart(rtksvr_t *svr, int cycle, int buffsize, int *strs, if (strlen(rcvopts[i]) < 256) { std::strncpy(svr->raw[i].opt, rcvopts[i], 256); + svr->raw[i].opt[255] = '\0'; } if (strlen(rcvopts[i]) < 256) { diff --git a/src/algorithms/libs/rtklib/rtklib_stream.cc b/src/algorithms/libs/rtklib/rtklib_stream.cc index f114cdecc..986e4c7b5 100644 --- a/src/algorithms/libs/rtklib/rtklib_stream.cc +++ b/src/algorithms/libs/rtklib/rtklib_stream.cc @@ -813,7 +813,7 @@ void decodetcppath(const char *path, char *addr, char *port, char *user, /* get socket error ----------------------------------------------------------*/ -int errsock(void) { return errno; } +int errsock() { return errno; } /* set socket option ---------------------------------------------------------*/ @@ -2241,7 +2241,7 @@ int stateftp(ftp_t *ftp) * args : none * return : none *-----------------------------------------------------------------------------*/ -void strinitcom(void) +void strinitcom() { tracet(3, "strinitcom:\n"); } diff --git a/src/algorithms/libs/rtklib/rtklib_stream.h b/src/algorithms/libs/rtklib/rtklib_stream.h index cfbc2a4f5..3c4caad48 100644 --- a/src/algorithms/libs/rtklib/rtklib_stream.h +++ b/src/algorithms/libs/rtklib/rtklib_stream.h @@ -113,7 +113,7 @@ void syncfile(file_t *file1, file_t *file2); void decodetcppath(const char *path, char *addr, char *port, char *user, char *passwd, char *mntpnt, char *str); -int errsock(void); +int errsock(); int setsock(socket_t sock, char *msg); @@ -196,7 +196,7 @@ int readftp(ftp_t *ftp, unsigned char *buff, int n, char *msg); int stateftp(ftp_t *ftp); -void strinitcom(void); +void strinitcom(); void strinit(stream_t *stream); diff --git a/src/algorithms/tracking/libs/tracking_loop_filter.cc b/src/algorithms/tracking/libs/tracking_loop_filter.cc index 553292308..85939db29 100644 --- a/src/algorithms/tracking/libs/tracking_loop_filter.cc +++ b/src/algorithms/tracking/libs/tracking_loop_filter.cc @@ -105,7 +105,7 @@ float Tracking_loop_filter::apply(float current_input) } -void Tracking_loop_filter::update_coefficients(void) +void Tracking_loop_filter::update_coefficients() { // Analog gains: float g1; @@ -219,7 +219,7 @@ void Tracking_loop_filter::set_noise_bandwidth(float noise_bandwidth) } -float Tracking_loop_filter::get_noise_bandwidth(void) const +float Tracking_loop_filter::get_noise_bandwidth() const { return d_noise_bandwidth; } @@ -232,7 +232,7 @@ void Tracking_loop_filter::set_update_interval(float update_interval) } -float Tracking_loop_filter::get_update_interval(void) const +float Tracking_loop_filter::get_update_interval() const { return d_update_interval; } @@ -245,7 +245,7 @@ void Tracking_loop_filter::set_include_last_integrator(bool include_last_integra } -bool Tracking_loop_filter::get_include_last_integrator(void) const +bool Tracking_loop_filter::get_include_last_integrator() const { return d_include_last_integrator; } @@ -266,7 +266,7 @@ void Tracking_loop_filter::set_order(int loop_order) } -int Tracking_loop_filter::get_order(void) const +int Tracking_loop_filter::get_order() const { return d_loop_order; } diff --git a/src/algorithms/tracking/libs/tracking_loop_filter.h b/src/algorithms/tracking/libs/tracking_loop_filter.h index 10dc855d9..300c491cb 100644 --- a/src/algorithms/tracking/libs/tracking_loop_filter.h +++ b/src/algorithms/tracking/libs/tracking_loop_filter.h @@ -54,10 +54,10 @@ public: Tracking_loop_filter(Tracking_loop_filter&&) = default; //!< Move operator Tracking_loop_filter& operator=(Tracking_loop_filter&& /*other*/) = default; //!< Move assignment operator - float get_noise_bandwidth(void) const; - float get_update_interval(void) const; - bool get_include_last_integrator(void) const; - int get_order(void) const; + float get_noise_bandwidth() const; + float get_update_interval() const; + bool get_include_last_integrator() const; + int get_order() const; void set_noise_bandwidth(float noise_bandwidth); void set_update_interval(float update_interval); @@ -94,7 +94,7 @@ private: float d_update_interval; // Compute the filter coefficients: - void update_coefficients(void); + void update_coefficients(); }; #endif