mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-12-14 20:20:35 +00:00
Code Issues Releases Wiki Activity

Fixes for changed behavior of clang-format

Browse Source
This commit is contained in:
Carles Fernandez 2020-11-06 10:41:20 +01:00
parent 30b52cd68e
commit f24064e245
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
13 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/algorithms/libs/rtklib/rtklib.h
View File

@ -326,6 +326,7 @@ const int MAXSTRMSG = 1024; //!< max length of stream message
using fatalfunc_t = void(const char *); //!< fatal callback function type
// clang-format off
#define STR_MODE_R 0x1 /* stream mode: read */
#define STR_MODE_W 0x2 /* stream mode: write */
#define STR_MODE_RW 0x3 /* stream mode: read/write */
@ -347,6 +348,7 @@ using fatalfunc_t = void(const char *); //!< fatal callback function type
#define NR_PPP(opt) (IT_PPP(opt) + ((opt)->tropopt < TROPOPT_EST ? 0 : ((opt)->tropopt == TROPOPT_EST ? 1 : 3))) /* number of solutions */
#define IB_PPP(s, opt) (NR_PPP(opt) + (s)-1) /* state index of phase bias */
#define NX_PPP(opt) (IB_PPP(MAXSAT, opt) + 1) /* number of estimated states */
// clang-format on
#define NF_RTK(opt) ((opt)->ionoopt == IONOOPT_IFLC ? 1 : (opt)->nf)
#define NP_RTK(opt) ((opt)->dynamics == 0 ? 3 : 9)

2
src/algorithms/libs/rtklib/rtklib_rtkpos.h
View File

@ -63,10 +63,12 @@ const double TTOL_MOVEB = (1.0 + 2 * DTTOL);
/* state variable index */
// clang-format off
#define II_RTK(s, opt) (NP_RTK(opt) + (s)-1) /* ionos (s:satellite no) */
#define IT_RTK(r, opt) (NP_RTK(opt) + NI_RTK(opt) + NT_RTK(opt) / 2 * (r)) /* tropos (r:0=rov,1:ref) */
#define IL_RTK(f, opt) (NP_RTK(opt) + NI_RTK(opt) + NT_RTK(opt) + (f)) /* receiver h/w bias */
#define IB_RTK(s, f, opt) (NR_RTK(opt) + MAXSAT * (f) + (s)-1) /* phase bias (s:satno,f:freq) */
// clang-format on
int rtkopenstat(const char *file, int level);

4
src/core/interfaces/gnss_block_interface.h
View File

@ -36,7 +36,7 @@
/** \addtogroup GNSS_Block_Interfaces
* \{ */
// clang-format off
#if GNURADIO_USES_STD_POINTERS
#include <memory>
template <typename T>
@ -57,6 +57,8 @@ gnss_shared_ptr<C> gnss_make_shared(Args &&... args)
return boost::make_shared<C>(std::forward<Args>(args)...);
}
#endif
// clang-format on
/*!
* \brief This abstract class represents an interface to GNSS blocks.

2
src/core/libs/supl/asn-rrlp/NativeInteger.c
View File

@ -132,6 +132,7 @@ asn_dec_rval_t NativeInteger_decode_ber(asn_codec_ctx_t *opt_codec_ctx,
return rval;
}
// clang-format off
/*
* Encode the NativeInteger using the standard INTEGER type DER encoder.
*/
@ -172,6 +173,7 @@ asn_enc_rval_t NativeInteger_encode_der(asn_TYPE_descriptor_t *sd, void *ptr,
}
return erval;
}
// clang-format on
/*
* Decode the chunk of XML text encoding INTEGER.

2
src/core/libs/supl/asn-rrlp/asn_internal.h
View File

@ -19,6 +19,7 @@ extern "C"
{
#endif
// clang-format off
/* Environment version might be used to avoid running with the old library */
#define ASN1C_ENVIRONMENT_VERSION 922 /* Compile-time version */
int get_asn1c_environment_version(void); /* Run-time version */
@ -60,6 +61,7 @@ extern "C"
}
#endif /* EMIT_ASN_DEBUG */
#endif /* ASN_DEBUG */
// clang-format on
/*
* Invoke the application-supplied callback and fail, if something is wrong.

2
src/core/libs/supl/asn-rrlp/asn_system.h
View File

@ -61,6 +61,7 @@ typedef unsigned int uint32_t;
#include <types/vxTypes.h>
#else /* !defined(__vxworks) */
// clang-format off
#include <inttypes.h> /* C99 specifies this file */
/*
* 1. Earlier FreeBSD version didn't have <stdint.h>,
@ -127,5 +128,6 @@ typedef unsigned int uint32_t;
#define MIN(a, b) ((a) < (b) ? (a) : (b)) /* Unsafe variant */
#endif /* __GNUC__ */
#endif /* MIN */
// clang-format on
#endif /* _ASN_SYSTEM_H_ */

2
src/core/libs/supl/asn-rrlp/xer_support.c
View File

@ -44,6 +44,7 @@ static int _charclass[256] = {
#define ALPHA(c) (_charclass[(unsigned char)(c)] == 3)
/* Aliases for characters, ASCII/UTF-8 */
// clang-format off
#define EXCLAM 0x21 /* '!' */
#define CQUOTE 0x22 /* '"' */
#define CDASH 0x2d /* '-' */
@ -52,6 +53,7 @@ static int _charclass[256] = {
#define CEQUAL 0x3d /* '=' */
#define RANGLE 0x3e /* '>' */
#define CQUEST 0x3f /* '?' */
// clang-format on
/* Invoke token callback */
#define TOKEN_CB_CALL(type, _ns, _current_too, _final) \

3
src/core/libs/supl/asn-supl/GeneralizedTime.c
View File

@ -759,6 +759,7 @@ GeneralizedTime_t *asn_time2GT_frac(GeneralizedTime_t *opt_gt,
gmtoff = GMTOFF(*tm);
// clang-format off
if (force_gmt && gmtoff)
{
tm_s = *tm;
@ -771,7 +772,7 @@ GeneralizedTime_t *asn_time2GT_frac(GeneralizedTime_t *opt_gt,
gmtoff = 0;
#endif
}
// clang-format on
size = snprintf(buf, buf_size, "%04d%02d%02d%02d%02d%02d",
tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday,
tm->tm_hour, tm->tm_min, tm->tm_sec);

2
src/core/libs/supl/asn-supl/NativeInteger.c
View File

@ -132,6 +132,7 @@ asn_dec_rval_t NativeInteger_decode_ber(asn_codec_ctx_t *opt_codec_ctx,
return rval;
}
// clang-format off
/*
* Encode the NativeInteger using the standard INTEGER type DER encoder.
*/
@ -172,6 +173,7 @@ asn_enc_rval_t NativeInteger_encode_der(asn_TYPE_descriptor_t *sd, void *ptr,
}
return erval;
}
// clang-format on
/*
* Decode the chunk of XML text encoding INTEGER.

2
src/core/libs/supl/asn-supl/asn_internal.h
View File

@ -19,6 +19,7 @@ extern "C"
{
#endif
// clang-format off
/* Environment version might be used to avoid running with the old library */
#define ASN1C_ENVIRONMENT_VERSION 922 /* Compile-time version */
int get_asn1c_environment_version(void); /* Run-time version */
@ -60,6 +61,7 @@ extern "C"
}
#endif /* EMIT_ASN_DEBUG */
#endif /* ASN_DEBUG */
// clang-format on
/*
* Invoke the application-supplied callback and fail, if something is wrong.

2
src/core/libs/supl/asn-supl/asn_system.h
View File

@ -61,6 +61,7 @@ typedef unsigned int uint32_t;
#include <types/vxTypes.h>
#else /* !defined(__vxworks) */
// clang-format off
#include <inttypes.h> /* C99 specifies this file */
/*
* 1. Earlier FreeBSD version didn't have <stdint.h>,
@ -127,5 +128,6 @@ typedef unsigned int uint32_t;
#define MIN(a, b) ((a) < (b) ? (a) : (b)) /* Unsafe variant */
#endif /* __GNUC__ */
#endif /* MIN */
// clang-format on
#endif /* _ASN_SYSTEM_H_ */

2
src/core/libs/supl/asn-supl/xer_support.c
View File

@ -44,6 +44,7 @@ static int _charclass[256] = {
#define ALPHA(c) (_charclass[(unsigned char)(c)] == 3)
/* Aliases for characters, ASCII/UTF-8 */
// clang-format off
#define EXCLAM 0x21 /* '!' */
#define CQUOTE 0x22 /* '"' */
#define CDASH 0x2d /* '-' */
@ -52,6 +53,7 @@ static int _charclass[256] = {
#define CEQUAL 0x3d /* '=' */
#define RANGLE 0x3e /* '>' */
#define CQUEST 0x3f /* '?' */
// clang-format on
/* Invoke token callback */
#define TOKEN_CB_CALL(type, _ns, _current_too, _final) \

2
src/tests/common-files/gnuplot_i.h
View File

@ -53,8 +53,10 @@ DEFINE_bool(show_plots, true, "Show plots on screen. Disable for non-interactive
#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__TOS_WIN__)
// defined for 32 and 64-bit environments
// clang-format off
#include <io.h> // for _access(), _mktemp()
#define GP_MAX_TMP_FILES 27 // 27 temporary files it's Microsoft restriction
// clang-format on
#elif defined(unix) || defined(__unix) || defined(__unix__) || defined(__APPLE__)
// all UNIX-like OSs (Linux, *BSD, macOS, Solaris, ...)
#include <unistd.h> // for access(), mkstemp()