Skip to content

Commit 92cfb2f

Browse files
lcarteylcartey
committed
Exclude NDEBUG, regenerate
Exclude NDEBUG which is not actually defined by any header, and update the generated files (include the outdated C99 file).
1 parent f5210ac commit 92cfb2f

File tree

3 files changed

+53
-50
lines changed

3 files changed

+53
-50
lines changed

‎cpp/common/src/ext/stdc11.generated.names.model.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
extensions:
22
- addsTo: {extensible: libraryMacroModel, pack: codeql/common-cpp-coding-standards}
33
data:
4-
- [C11, assert.h, NDEBUG, '']
54
- [C11, assert.h, static_assert, '']
65
- [C11, complex.h, __STDC_NO_COMPLEX__, '']
76
- [C11, complex.h, complex, '']

‎cpp/common/src/ext/stdc99.generated.names.model.yml‎

Lines changed: 48 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
extensions:
22
- addsTo: {extensible: libraryMacroModel, pack: codeql/common-cpp-coding-standards}
33
data:
4-
- [C99, assert.h, NDEBUG, '']
54
- [C99, complex.h, complex, '']
65
- [C99, complex.h, _Complex_I, '']
76
- [C99, complex.h, imaginary, '']
@@ -582,8 +581,8 @@ extensions:
582581
- [C99, inttypes.h, '', '', strtoumax, uintmax_t, '(const char * restrict nptr,char ** restrict endptr, int base)', external]
583582
- [C99, inttypes.h, '', '', wcstoimax, intmax_t, '(const wchar_t * restrict nptr,wchar_t ** restrict endptr, int base)', external]
584583
- [C99, inttypes.h, '', '', wcstoumax, uintmax_t, '(const wchar_t * restrict nptr,wchar_t ** restrict endptr, int base)', external]
585-
- [C99, locale.h, '', '', '*setlocale', char, '(int category, const char *locale)', external]
586-
- [C99, locale.h, '', '', '*localeconv', struct lconv, (void), external]
584+
- [C99, locale.h, '', '', setlocale, char *, '(int category, const char *locale)', external]
585+
- [C99, locale.h, '', '', localeconv, struct lconv *, (void), external]
587586
- [C99, math.h, '', '', fpclassify, int, (real-floating x), external]
588587
- [C99, math.h, '', '', isfinite, int, (real-floating x), external]
589588
- [C99, math.h, '', '', isinf, int, (real-floating x), external]
@@ -769,20 +768,20 @@ extensions:
769768
- [C99, math.h, '', '', isunordered, int, '(real-floating x, real-floating y)', external]
770769
- [C99, setjmp.h, '', '', setjmp, int, (jmp_buf env), external]
771770
- [C99, setjmp.h, '', '', longjmp, void, '(jmp_buf env, int val)', external]
772-
- [C99, signal.h, '', '', (*func)(int))), 'void (*signal(int sig, void', (int), external]
771+
- [C99, signal.h, '', '', signal, void (*signal)(int), '(int sig, void (*func)(int))', external]
773772
- [C99, signal.h, '', '', raise, int, (int sig), external]
774773
- [C99, stdarg.h, '', '', va_arg, type, '(va_list ap, type)', external]
775774
- [C99, stdarg.h, '', '', va_copy, void, '(va_list dest, va_list src)', external]
776775
- [C99, stdarg.h, '', '', va_end, void, (va_list ap), external]
777776
- [C99, stdarg.h, '', '', va_start, void, '(va_list ap, parmN)', external]
778777
- [C99, stdio.h, '', '', remove, int, (const char *filename), external]
779778
- [C99, stdio.h, '', '', rename, int, '(const char *old, const char *new)', external]
780-
- [C99, stdio.h, '', '', '*tmpfile', FILE, (void), external]
781-
- [C99, stdio.h, '', '', '*tmpnam', char, (char *s), external]
779+
- [C99, stdio.h, '', '', tmpfile, FILE *, (void), external]
780+
- [C99, stdio.h, '', '', tmpnam, char *, (char *s), external]
782781
- [C99, stdio.h, '', '', fclose, int, (FILE *stream), external]
783782
- [C99, stdio.h, '', '', fflush, int, (FILE *stream), external]
784-
- [C99, stdio.h, '', '', '*fopen', FILE, '(const char * restrict filename,const char * restrict mode)', external]
785-
- [C99, stdio.h, '', '', '*freopen', FILE, '(const char * restrict filename,const char * restrict mode,FILE * restrict stream)', external]
783+
- [C99, stdio.h, '', '', fopen, FILE *, '(const char * restrict filename,const char * restrict mode)', external]
784+
- [C99, stdio.h, '', '', freopen, FILE *, '(const char * restrict filename,const char * restrict mode,FILE * restrict stream)', external]
786785
- [C99, stdio.h, '', '', setbuf, void, '(FILE * restrict stream,char * restrict buf)', external]
787786
- [C99, stdio.h, '', '', setvbuf, int, '(FILE * restrict stream,char * restrict buf,int mode, size_t size)', external]
788787
- [C99, stdio.h, '', '', fprintf, int, '(FILE * restrict stream,const char * restrict format, ...)', external]
@@ -800,12 +799,12 @@ extensions:
800799
- [C99, stdio.h, '', '', vsprintf, int, '(char * restrict s,const char * restrict format, va_list arg)', external]
801800
- [C99, stdio.h, '', '', vsscanf, int, '(const char * restrict s,const char * restrict format, va_list arg)', external]
802801
- [C99, stdio.h, '', '', fgetc, int, (FILE *stream), external]
803-
- [C99, stdio.h, '', '', '*fgets', char, '(char * restrict s, int n,FILE * restrict stream)', external]
802+
- [C99, stdio.h, '', '', fgets, char *, '(char * restrict s, int n,FILE * restrict stream)', external]
804803
- [C99, stdio.h, '', '', fputc, int, '(int c, FILE *stream)', external]
805804
- [C99, stdio.h, '', '', fputs, int, '(const char * restrict s,FILE * restrict stream)', external]
806805
- [C99, stdio.h, '', '', getc, int, (FILE *stream), external]
807806
- [C99, stdio.h, '', '', getchar, int, (void), external]
808-
- [C99, stdio.h, '', '', '*gets', char, (char *s), external]
807+
- [C99, stdio.h, '', '', gets, char *, (char *s), external]
809808
- [C99, stdio.h, '', '', putc, int, '(int c, FILE *stream)', external]
810809
- [C99, stdio.h, '', '', putchar, int, (int c), external]
811810
- [C99, stdio.h, '', '', puts, int, (const char *s), external]
@@ -834,18 +833,18 @@ extensions:
834833
- [C99, stdlib.h, '', '', strtoull, unsigned long long int, '(const char * restrict nptr,char ** restrict endptr, int base)', external]
835834
- [C99, stdlib.h, '', '', rand, int, (void), external]
836835
- [C99, stdlib.h, '', '', srand, void, (unsigned int seed), external]
837-
- [C99, stdlib.h, '', '', '*calloc', void, '(size_t nmemb, size_t size)', external]
836+
- [C99, stdlib.h, '', '', calloc, void *, '(size_t nmemb, size_t size)', external]
838837
- [C99, stdlib.h, '', '', free, void, (void *ptr), external]
839-
- [C99, stdlib.h, '', '', '*malloc', void, (size_t size), external]
840-
- [C99, stdlib.h, '', '', '*realloc', void, '(void *ptr, size_t size)', external]
838+
- [C99, stdlib.h, '', '', malloc, void *, (size_t size), external]
839+
- [C99, stdlib.h, '', '', realloc, void *, '(void *ptr, size_t size)', external]
841840
- [C99, stdlib.h, '', '', abort, void, (void), external]
842-
- [C99, stdlib.h, '', '', (*func), int atexit(void, (void)), external]
841+
- [C99, stdlib.h, '', '', atexit, int, (void (*func)(void)), external]
843842
- [C99, stdlib.h, '', '', exit, void, (int status), external]
844843
- [C99, stdlib.h, '', '', _Exit, void, (int status), external]
845-
- [C99, stdlib.h, '', '', '*getenv', char, (const char *name), external]
844+
- [C99, stdlib.h, '', '', getenv, char *, (const char *name), external]
846845
- [C99, stdlib.h, '', '', system, int, (const char *string), external]
847-
- [C99, stdlib.h, '', '', (*compar), 'void *bsearch(const void *key, const void *base,size_t nmemb, size_t size,int', '(const void *, const void *))', external]
848-
- [C99, stdlib.h, '', '', (*compar), 'void qsort(void *base, size_t nmemb, size_t size,int', '(const void *, const void *))', external]
846+
- [C99, stdlib.h, '', '', bsearch, void *, '(const void *key, const void *base,size_t nmemb, size_t size,int (*compar)(const void *, const void *))', external]
847+
- [C99, stdlib.h, '', '', qsort, void, '(void *base, size_t nmemb, size_t size,int (*compar)(const void *, const void *))', external]
849848
- [C99, stdlib.h, '', '', abs, int, (int j), external]
850849
- [C99, stdlib.h, '', '', labs, long int, (long int j), external]
851850
- [C99, stdlib.h, '', '', llabs, long long int, (long long int j), external]
@@ -857,36 +856,36 @@ extensions:
857856
- [C99, stdlib.h, '', '', wctomb, int, '(char *s, wchar_t wchar)', external]
858857
- [C99, stdlib.h, '', '', mbstowcs, size_t, '(wchar_t * restrict pwcs,const char * restrict s, size_t n)', external]
859858
- [C99, stdlib.h, '', '', wcstombs, size_t, '(char * restrict s,const wchar_t * restrict pwcs, size_t n)', external]
860-
- [C99, string.h, '', '', '*memcpy', void, '(void * restrict s1,const void * restrict s2, size_t n)', external]
861-
- [C99, string.h, '', '', '*memmove', void, '(void *s1, const void *s2, size_t n)', external]
862-
- [C99, string.h, '', '', '*strcpy', char, '(char * restrict s1,const char * restrict s2)', external]
863-
- [C99, string.h, '', '', '*strncpy', char, '(char * restrict s1,const char * restrict s2, size_t n)', external]
864-
- [C99, string.h, '', '', '*strcat', char, '(char * restrict s1,const char * restrict s2)', external]
865-
- [C99, string.h, '', '', '*strncat', char, '(char * restrict s1,const char * restrict s2, size_t n)', external]
859+
- [C99, string.h, '', '', memcpy, void *, '(void * restrict s1,const void * restrict s2, size_t n)', external]
860+
- [C99, string.h, '', '', memmove, void *, '(void *s1, const void *s2, size_t n)', external]
861+
- [C99, string.h, '', '', strcpy, char *, '(char * restrict s1,const char * restrict s2)', external]
862+
- [C99, string.h, '', '', strncpy, char *, '(char * restrict s1,const char * restrict s2, size_t n)', external]
863+
- [C99, string.h, '', '', strcat, char *, '(char * restrict s1,const char * restrict s2)', external]
864+
- [C99, string.h, '', '', strncat, char *, '(char * restrict s1,const char * restrict s2, size_t n)', external]
866865
- [C99, string.h, '', '', memcmp, int, '(const void *s1, const void *s2, size_t n)', external]
867866
- [C99, string.h, '', '', strcmp, int, '(const char *s1, const char *s2)', external]
868867
- [C99, string.h, '', '', strcoll, int, '(const char *s1, const char *s2)', external]
869868
- [C99, string.h, '', '', strncmp, int, '(const char *s1, const char *s2, size_t n)', external]
870869
- [C99, string.h, '', '', strxfrm, size_t, '(char * restrict s1,const char * restrict s2, size_t n)', external]
871-
- [C99, string.h, '', '', '*memchr', void, '(const void *s, int c, size_t n)', external]
872-
- [C99, string.h, '', '', '*strchr', char, '(const char *s, int c)', external]
870+
- [C99, string.h, '', '', memchr, void *, '(const void *s, int c, size_t n)', external]
871+
- [C99, string.h, '', '', strchr, char *, '(const char *s, int c)', external]
873872
- [C99, string.h, '', '', strcspn, size_t, '(const char *s1, const char *s2)', external]
874-
- [C99, string.h, '', '', '*strpbrk', char, '(const char *s1, const char *s2)', external]
875-
- [C99, string.h, '', '', '*strrchr', char, '(const char *s, int c)', external]
873+
- [C99, string.h, '', '', strpbrk, char *, '(const char *s1, const char *s2)', external]
874+
- [C99, string.h, '', '', strrchr, char *, '(const char *s, int c)', external]
876875
- [C99, string.h, '', '', strspn, size_t, '(const char *s1, const char *s2)', external]
877-
- [C99, string.h, '', '', '*strstr', char, '(const char *s1, const char *s2)', external]
878-
- [C99, string.h, '', '', '*strtok', char, '(char * restrict s1,const char * restrict s2)', external]
879-
- [C99, string.h, '', '', '*memset', void, '(void *s, int c, size_t n)', external]
880-
- [C99, string.h, '', '', '*strerror', char, (int errnum), external]
876+
- [C99, string.h, '', '', strstr, char *, '(const char *s1, const char *s2)', external]
877+
- [C99, string.h, '', '', strtok, char *, '(char * restrict s1,const char * restrict s2)', external]
878+
- [C99, string.h, '', '', memset, void *, '(void *s, int c, size_t n)', external]
879+
- [C99, string.h, '', '', strerror, char *, (int errnum), external]
881880
- [C99, string.h, '', '', strlen, size_t, (const char *s), external]
882881
- [C99, time.h, '', '', clock, clock_t, (void), external]
883882
- [C99, time.h, '', '', difftime, double, '(time_t time1, time_t time0)', external]
884883
- [C99, time.h, '', '', mktime, time_t, (struct tm *timeptr), external]
885884
- [C99, time.h, '', '', time, time_t, (time_t *timer), external]
886-
- [C99, time.h, '', '', '*asctime', char, (const struct tm *timeptr), external]
887-
- [C99, time.h, '', '', '*ctime', char, (const time_t *timer), external]
888-
- [C99, time.h, '', '', '*gmtime', struct tm, (const time_t *timer), external]
889-
- [C99, time.h, '', '', '*localtime', struct tm, (const time_t *timer), external]
885+
- [C99, time.h, '', '', asctime, char *, (const struct tm *timeptr), external]
886+
- [C99, time.h, '', '', ctime, char *, (const time_t *timer), external]
887+
- [C99, time.h, '', '', gmtime, struct tm *, (const time_t *timer), external]
888+
- [C99, time.h, '', '', localtime, struct tm *, (const time_t *timer), external]
890889
- [C99, time.h, '', '', strftime, size_t, '(char * restrict s,size_t maxsize,const char * restrict format,const struct tm * restrict timeptr)', external]
891890
- [C99, wchar.h, '', '', fwprintf, int, '(FILE * restrict stream,const wchar_t * restrict format, ...)', external]
892891
- [C99, wchar.h, '', '', fwscanf, int, '(FILE * restrict stream,const wchar_t * restrict format, ...)', external]
@@ -901,7 +900,7 @@ extensions:
901900
- [C99, wchar.h, '', '', wprintf, int, '(const wchar_t * restrict format, ...)', external]
902901
- [C99, wchar.h, '', '', wscanf, int, '(const wchar_t * restrict format, ...)', external]
903902
- [C99, wchar.h, '', '', fgetwc, wint_t, (FILE *stream), external]
904-
- [C99, wchar.h, '', '', '*fgetws', wchar_t, '(wchar_t * restrict s, int n,FILE * restrict stream)', external]
903+
- [C99, wchar.h, '', '', fgetws, wchar_t *, '(wchar_t * restrict s, int n,FILE * restrict stream)', external]
905904
- [C99, wchar.h, '', '', fputwc, wint_t, '(wchar_t c, FILE *stream)', external]
906905
- [C99, wchar.h, '', '', fputws, int, '(const wchar_t * restrict s,FILE * restrict stream)', external]
907906
- [C99, wchar.h, '', '', fwide, int, '(FILE *stream, int mode)', external]
@@ -917,27 +916,27 @@ extensions:
917916
- [C99, wchar.h, '', '', wcstoll, long long int, '(const wchar_t * restrict nptr,wchar_t ** restrict endptr, int base)', external]
918917
- [C99, wchar.h, '', '', wcstoul, unsigned long int, '(const wchar_t * restrict nptr,wchar_t ** restrict endptr, int base)', external]
919918
- [C99, wchar.h, '', '', wcstoull, unsigned long long int, '(const wchar_t * restrict nptr,wchar_t ** restrict endptr, int base)', external]
920-
- [C99, wchar.h, '', '', '*wcscpy', wchar_t, '(wchar_t * restrict s1,const wchar_t * restrict s2)', external]
921-
- [C99, wchar.h, '', '', '*wcsncpy', wchar_t, '(wchar_t * restrict s1,const wchar_t * restrict s2, size_t n)', external]
922-
- [C99, wchar.h, '', '', '*wmemcpy', wchar_t, '(wchar_t * restrict s1,const wchar_t * restrict s2, size_t n)', external]
923-
- [C99, wchar.h, '', '', '*wmemmove', wchar_t, '(wchar_t *s1, const wchar_t *s2,size_t n)', external]
924-
- [C99, wchar.h, '', '', '*wcscat', wchar_t, '(wchar_t * restrict s1,const wchar_t * restrict s2)', external]
925-
- [C99, wchar.h, '', '', '*wcsncat', wchar_t, '(wchar_t * restrict s1,const wchar_t * restrict s2, size_t n)', external]
919+
- [C99, wchar.h, '', '', wcscpy, wchar_t *, '(wchar_t * restrict s1,const wchar_t * restrict s2)', external]
920+
- [C99, wchar.h, '', '', wcsncpy, wchar_t *, '(wchar_t * restrict s1,const wchar_t * restrict s2, size_t n)', external]
921+
- [C99, wchar.h, '', '', wmemcpy, wchar_t *, '(wchar_t * restrict s1,const wchar_t * restrict s2, size_t n)', external]
922+
- [C99, wchar.h, '', '', wmemmove, wchar_t *, '(wchar_t *s1, const wchar_t *s2,size_t n)', external]
923+
- [C99, wchar.h, '', '', wcscat, wchar_t *, '(wchar_t * restrict s1,const wchar_t * restrict s2)', external]
924+
- [C99, wchar.h, '', '', wcsncat, wchar_t *, '(wchar_t * restrict s1,const wchar_t * restrict s2, size_t n)', external]
926925
- [C99, wchar.h, '', '', wcscmp, int, '(const wchar_t *s1, const wchar_t *s2)', external]
927926
- [C99, wchar.h, '', '', wcscoll, int, '(const wchar_t *s1, const wchar_t *s2)', external]
928927
- [C99, wchar.h, '', '', wcsncmp, int, '(const wchar_t *s1, const wchar_t *s2,size_t n)', external]
929928
- [C99, wchar.h, '', '', wcsxfrm, size_t, '(wchar_t * restrict s1,const wchar_t * restrict s2, size_t n)', external]
930929
- [C99, wchar.h, '', '', wmemcmp, int, '(const wchar_t *s1, const wchar_t *s2,size_t n)', external]
931-
- [C99, wchar.h, '', '', '*wcschr', wchar_t, '(const wchar_t *s, wchar_t c)', external]
930+
- [C99, wchar.h, '', '', wcschr, wchar_t *, '(const wchar_t *s, wchar_t c)', external]
932931
- [C99, wchar.h, '', '', wcscspn, size_t, '(const wchar_t *s1, const wchar_t *s2)', external]
933-
- [C99, wchar.h, '', '', '*wcspbrk', wchar_t, '(const wchar_t *s1, const wchar_t *s2)', external]
934-
- [C99, wchar.h, '', '', '*wcsrchr', wchar_t, '(const wchar_t *s, wchar_t c)', external]
932+
- [C99, wchar.h, '', '', wcspbrk, wchar_t *, '(const wchar_t *s1, const wchar_t *s2)', external]
933+
- [C99, wchar.h, '', '', wcsrchr, wchar_t *, '(const wchar_t *s, wchar_t c)', external]
935934
- [C99, wchar.h, '', '', wcsspn, size_t, '(const wchar_t *s1, const wchar_t *s2)', external]
936-
- [C99, wchar.h, '', '', '*wcsstr', wchar_t, '(const wchar_t *s1, const wchar_t *s2)', external]
937-
- [C99, wchar.h, '', '', '*wcstok', wchar_t, '(wchar_t * restrict s1,const wchar_t * restrict s2,wchar_t ** restrict ptr)', external]
938-
- [C99, wchar.h, '', '', '*wmemchr', wchar_t, '(const wchar_t *s, wchar_t c, size_t n)', external]
935+
- [C99, wchar.h, '', '', wcsstr, wchar_t *, '(const wchar_t *s1, const wchar_t *s2)', external]
936+
- [C99, wchar.h, '', '', wcstok, wchar_t *, '(wchar_t * restrict s1,const wchar_t * restrict s2,wchar_t ** restrict ptr)', external]
937+
- [C99, wchar.h, '', '', wmemchr, wchar_t *, '(const wchar_t *s, wchar_t c, size_t n)', external]
939938
- [C99, wchar.h, '', '', wcslen, size_t, (const wchar_t *s), external]
940-
- [C99, wchar.h, '', '', '*wmemset', wchar_t, '(wchar_t *s, wchar_t c, size_t n)', external]
939+
- [C99, wchar.h, '', '', wmemset, wchar_t *, '(wchar_t *s, wchar_t c, size_t n)', external]
941940
- [C99, wchar.h, '', '', wcsftime, size_t, '(wchar_t * restrict s, size_t maxsize,const wchar_t * restrict format,const struct tm * restrict timeptr)', external]
942941
- [C99, wchar.h, '', '', btowc, wint_t, (int c), external]
943942
- [C99, wchar.h, '', '', wctob, int, (wint_t c), external]

‎scripts/generate_standard_library_models/c/generate_c_standard_library_models.py‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,11 @@ def map_size_vars(name):
140140
mapped_name.replace("struct-","struct "),
141141
])
142142
else:
143+
if mapped_name == "NDEBUG":
144+
# Ignore NDEBUG
145+
print("Note: skipping NDEBUG, not part of a header")
146+
continue
147+
143148
# Assume anything remaining is a macro
144149
macros.append([
145150
# standard

0 commit comments

Comments
 (0)