github · lcartey · May 10, 2023 · Apr 25, 2023 · Apr 25, 2023 · Apr 25, 2023
diff --git a/change_notes/2023-04-28-a14-7-2.md b/change_notes/2023-04-28-a14-7-2.md
@@ -0,0 +1 @@
+ * `A14-7-2` - alert messages have been slightly adjusted to refer only to the base name of a file, not the full relative path.
diff --git a/cpp/autosar/src/rules/A14-7-2/TemplateSpecializationNotDeclaredInTheSameFile.ql b/cpp/autosar/src/rules/A14-7-2/TemplateSpecializationNotDeclaredInTheSameFile.ql
@@ -58,4 +58,4 @@ where
  not spec.getFile() = spec.getPrimary().getFile() and
  not extraExclude(spec)
 select spec, "Specialization found in file $@ where primary template is outside that file.",
-  spec.getFile(), spec.getFile().getRelativePath()
+  spec.getFile(), spec.getFile().getBaseName()
diff --git a/cpp/autosar/test/rules/A14-7-2/TemplateSpecializationNotDeclaredInTheSameFile.expected b/cpp/autosar/test/rules/A14-7-2/TemplateSpecializationNotDeclaredInTheSameFile.expected
@@ -1,3 +1,3 @@
-| test.cpp:5:20:5:25 | s<int> | Specialization found in file $@ where primary template is outside that file. | test.cpp:0:0:0:0 | test.cpp | rules/A14-7-2/test.cpp |
-| test.cpp:7:18:7:24 | f | Specialization found in file $@ where primary template is outside that file. | test.cpp:0:0:0:0 | test.cpp | rules/A14-7-2/test.cpp |
-| test.cpp:13:19:13:28 | vector<s1, allocator<s1>> | Specialization found in file $@ where primary template is outside that file. | test.cpp:0:0:0:0 | test.cpp | rules/A14-7-2/test.cpp |
+| test.cpp:5:20:5:25 | s<int> | Specialization found in file $@ where primary template is outside that file. | test.cpp:0:0:0:0 | test.cpp | test.cpp |
+| test.cpp:7:18:7:24 | f | Specialization found in file $@ where primary template is outside that file. | test.cpp:0:0:0:0 | test.cpp | test.cpp |
+| test.cpp:13:19:13:28 | vector<s1, allocator<s1>> | Specialization found in file $@ where primary template is outside that file. | test.cpp:0:0:0:0 | test.cpp | test.cpp |
diff --git a/cpp/autosar/test/rules/A15-1-5/ExceptionsThrownAcrossExecutionBoundaries.expected.clang b/cpp/autosar/test/rules/A15-1-5/ExceptionsThrownAcrossExecutionBoundaries.expected.clang
diff --git a/cpp/autosar/test/rules/A15-1-5/ExceptionsThrownAcrossExecutionBoundaries.expected.gcc b/cpp/autosar/test/rules/A15-1-5/ExceptionsThrownAcrossExecutionBoundaries.expected.gcc
diff --git a/cpp/autosar/test/rules/A15-1-5/ExceptionsThrownAcrossExecutionBoundaries.expected.qcc b/cpp/autosar/test/rules/A15-1-5/ExceptionsThrownAcrossExecutionBoundaries.expected.qcc
diff --git a/cpp/autosar/test/rules/A18-0-3/LocaleFunctionsUsed.expected b/cpp/autosar/test/rules/A18-0-3/LocaleFunctionsUsed.expected
@@ -1,10 +1,10 @@
-| test.cpp:4:3:4:16 | call to setlocale | Use of <clocale> function 'std::setlocale'. |
-| test.cpp:5:3:5:16 | call to setlocale | Use of <clocale> function 'std::setlocale'. |
-| test.cpp:6:3:6:16 | call to setlocale | Use of <clocale> function 'std::setlocale'. |
-| test.cpp:7:3:7:16 | call to setlocale | Use of <clocale> function 'std::setlocale'. |
-| test.cpp:8:3:8:16 | call to setlocale | Use of <clocale> function 'std::setlocale'. |
-| test.cpp:9:3:9:16 | call to setlocale | Use of <clocale> function 'std::setlocale'. |
-| test.cpp:10:20:10:34 | call to localeconv | Use of <clocale> function 'std::localeconv'. |
+| test.cpp:4:3:4:16 | call to setlocale | Use of <clocale> function 'setlocale'. |
+| test.cpp:5:3:5:16 | call to setlocale | Use of <clocale> function 'setlocale'. |
+| test.cpp:6:3:6:16 | call to setlocale | Use of <clocale> function 'setlocale'. |
+| test.cpp:7:3:7:16 | call to setlocale | Use of <clocale> function 'setlocale'. |
+| test.cpp:8:3:8:16 | call to setlocale | Use of <clocale> function 'setlocale'. |
+| test.cpp:9:3:9:16 | call to setlocale | Use of <clocale> function 'setlocale'. |
+| test.cpp:10:20:10:34 | call to localeconv | Use of <clocale> function 'localeconv'. |
 | test.cpp:12:3:12:11 | call to setlocale | Use of <clocale> function 'setlocale'. |
 | test.cpp:13:3:13:11 | call to setlocale | Use of <clocale> function 'setlocale'. |
 | test.cpp:14:3:14:11 | call to setlocale | Use of <clocale> function 'setlocale'. |

diff --git a/cpp/autosar/test/rules/A18-0-3/LocaleTypeLConvUsed.expected b/cpp/autosar/test/rules/A18-0-3/LocaleTypeLConvUsed.expected
@@ -1,2 +1,2 @@
-| test.cpp:10:8:10:12 | type mention | Use of <clocale> type 'std::lconv'. |
+| test.cpp:10:8:10:12 | type mention | Use of <clocale> type 'lconv'. |
 | test.cpp:18:3:18:7 | type mention | Use of <clocale> type 'lconv'. |
diff --git a/cpp/autosar/test/rules/M18-2-1/MacroOffsetofUsed.expected.gcc b/cpp/autosar/test/rules/M18-2-1/MacroOffsetofUsed.expected.gcc
@@ -0,0 +1 @@
+| test.cpp:9:32:9:51 | offsetof(__typ,__id) | Use of banned macro offsetof. |
diff --git a/cpp/autosar/test/rules/M18-2-1/MacroOffsetofUsed.expected.qcc b/cpp/autosar/test/rules/M18-2-1/MacroOffsetofUsed.expected.qcc
@@ -0,0 +1 @@
+| test.cpp:9:32:9:51 | offsetof(__typ,__id) | Use of banned macro offsetof. |
diff --git a/cpp/autosar/test/rules/M18-7-1/CsignalFunctionsUsed.expected b/cpp/autosar/test/rules/M18-7-1/CsignalFunctionsUsed.expected
@@ -1,4 +1,4 @@
-| test.cpp:7:3:7:13 | call to signal | Use of <csignal> function 'std::signal'. |
-| test.cpp:8:3:8:12 | call to raise | Use of <csignal> function 'std::raise'. |
+| test.cpp:7:3:7:13 | call to signal | Use of <csignal> function 'signal'. |
+| test.cpp:8:3:8:12 | call to raise | Use of <csignal> function 'raise'. |
 | test.cpp:11:3:11:8 | call to signal | Use of <csignal> function 'signal'. |
 | test.cpp:12:3:12:7 | call to raise | Use of <csignal> function 'raise'. |
diff --git a/cpp/autosar/test/rules/M18-7-1/CsignalTypesUsed.expected b/cpp/autosar/test/rules/M18-7-1/CsignalTypesUsed.expected
@@ -1,2 +1,2 @@
-| test.cpp:6:8:6:19 | type mention | Use of <csignal> type 'std::sig_atomic_t'. |
+| test.cpp:6:8:6:19 | type mention | Use of <csignal> type 'sig_atomic_t'. |
 | test.cpp:10:3:10:14 | type mention | Use of <csignal> type 'sig_atomic_t'. |
diff --git a/cpp/autosar/test/rules/M27-0-1/CstdioFunctionsUsed.expected b/cpp/autosar/test/rules/M27-0-1/CstdioFunctionsUsed.expected
@@ -1,20 +1,20 @@
-| test.cpp:4:18:4:27 | call to fopen | Use of <cstdio> function 'std::fopen'. |
-| test.cpp:7:3:7:14 | call to fgetpos | Use of <cstdio> function 'std::fgetpos'. |
-| test.cpp:9:11:9:19 | call to feof | Use of <cstdio> function 'std::feof'. |
-| test.cpp:10:14:10:23 | call to fgetc | Use of <cstdio> function 'std::fgetc'. |
-| test.cpp:12:7:12:17 | call to rewind | Use of <cstdio> function 'std::rewind'. |
-| test.cpp:14:7:14:17 | call to ferror | Use of <cstdio> function 'std::ferror'. |
-| test.cpp:15:5:15:17 | call to clearerr | Use of <cstdio> function 'std::clearerr'. |
-| test.cpp:16:5:16:15 | call to fclose | Use of <cstdio> function 'std::fclose'. |
-| test.cpp:17:5:17:15 | call to perror | Use of <cstdio> function 'std::perror'. |
-| test.cpp:20:3:20:12 | call to fseek | Use of <cstdio> function 'std::fseek'. |
-| test.cpp:21:3:21:12 | call to fseek | Use of <cstdio> function 'std::fseek'. |
-| test.cpp:23:3:23:12 | call to fread | Use of <cstdio> function 'std::fread'. |
-| test.cpp:25:3:25:14 | call to fsetpos | Use of <cstdio> function 'std::fsetpos'. |
-| test.cpp:26:3:26:13 | call to fflush | Use of <cstdio> function 'std::fflush'. |
-| test.cpp:27:3:27:13 | call to fclose | Use of <cstdio> function 'std::fclose'. |
-| test.cpp:29:3:29:13 | call to printf | Use of <cstdio> function 'std::printf'. |
-| test.cpp:31:3:31:11 | call to puts | Use of <cstdio> function 'std::puts'. |
+| test.cpp:4:18:4:27 | call to fopen | Use of <cstdio> function 'fopen'. |
+| test.cpp:7:3:7:14 | call to fgetpos | Use of <cstdio> function 'fgetpos'. |
+| test.cpp:9:11:9:19 | call to feof | Use of <cstdio> function 'feof'. |
+| test.cpp:10:14:10:23 | call to fgetc | Use of <cstdio> function 'fgetc'. |
+| test.cpp:12:7:12:17 | call to rewind | Use of <cstdio> function 'rewind'. |
+| test.cpp:14:7:14:17 | call to ferror | Use of <cstdio> function 'ferror'. |
+| test.cpp:15:5:15:17 | call to clearerr | Use of <cstdio> function 'clearerr'. |
+| test.cpp:16:5:16:15 | call to fclose | Use of <cstdio> function 'fclose'. |
+| test.cpp:17:5:17:15 | call to perror | Use of <cstdio> function 'perror'. |
+| test.cpp:20:3:20:12 | call to fseek | Use of <cstdio> function 'fseek'. |
+| test.cpp:21:3:21:12 | call to fseek | Use of <cstdio> function 'fseek'. |
+| test.cpp:23:3:23:12 | call to fread | Use of <cstdio> function 'fread'. |
+| test.cpp:25:3:25:14 | call to fsetpos | Use of <cstdio> function 'fsetpos'. |
+| test.cpp:26:3:26:13 | call to fflush | Use of <cstdio> function 'fflush'. |
+| test.cpp:27:3:27:13 | call to fclose | Use of <cstdio> function 'fclose'. |
+| test.cpp:29:3:29:13 | call to printf | Use of <cstdio> function 'printf'. |
+| test.cpp:31:3:31:11 | call to puts | Use of <cstdio> function 'puts'. |
 | test.cpp:34:14:34:18 | call to fopen | Use of <cstdio> function 'fopen'. |
 | test.cpp:37:3:37:9 | call to fgetpos | Use of <cstdio> function 'fgetpos'. |
 | test.cpp:39:11:39:14 | call to feof | Use of <cstdio> function 'feof'. |

diff --git a/cpp/autosar/test/rules/M27-0-1/CstdioTypesUsed.expected b/cpp/autosar/test/rules/M27-0-1/CstdioTypesUsed.expected
@@ -1,4 +1,4 @@
-| test.cpp:4:8:4:11 | type mention | Use of <cstdio> type 'std::FILE'. |
-| test.cpp:6:8:6:13 | type mention | Use of <cstdio> type 'std::fpos_t'. |
+| test.cpp:4:8:4:11 | type mention | Use of <cstdio> type 'FILE'. |
+| test.cpp:6:8:6:13 | type mention | Use of <cstdio> type 'fpos_t'. |
 | test.cpp:34:3:34:6 | type mention | Use of <cstdio> type 'FILE'. |
 | test.cpp:36:3:36:8 | type mention | Use of <cstdio> type 'fpos_t'. |
diff --git a/cpp/cert/test/rules/ERR59-CPP/DoNotThrowAnExceptionAcrossExecutionBoundaries.expected.clang b/cpp/cert/test/rules/ERR59-CPP/DoNotThrowAnExceptionAcrossExecutionBoundaries.expected.clang
diff --git a/cpp/cert/test/rules/ERR59-CPP/DoNotThrowAnExceptionAcrossExecutionBoundaries.expected.gcc b/cpp/cert/test/rules/ERR59-CPP/DoNotThrowAnExceptionAcrossExecutionBoundaries.expected.gcc
diff --git a/cpp/cert/test/rules/ERR59-CPP/DoNotThrowAnExceptionAcrossExecutionBoundaries.expected.qcc b/cpp/cert/test/rules/ERR59-CPP/DoNotThrowAnExceptionAcrossExecutionBoundaries.expected.qcc
diff --git a/cpp/common/test/includes/standard-library/clocale b/cpp/common/test/includes/standard-library/clocale
@@ -8,13 +8,10 @@
 #define LC_NUMERIC 0
 #define LC_TIME 0

+#include <locale.h>
+
 namespace std {
-struct lconv;
-char *setlocale(int, const char *);
-lconv *localeconv();
+using ::lconv;
+using ::localeconv;
+using ::setlocale;
 } // namespace std
-
-// global namespace
-struct lconv;
-char *setlocale(int, const char *);
-lconv *localeconv();
diff --git a/cpp/common/test/includes/standard-library/csignal b/cpp/common/test/includes/standard-library/csignal
@@ -10,13 +10,10 @@
 #define SIG_IGN 7
 #define SIG_ERR 8

-namespace std {
-typedef int sig_atomic_t;
-void (*signal(int, void (*func)(int)))(int);
-int raise(int sig);
-} // namespace std
+#include <signal.h>

-// global namespace
-typedef int sig_atomic_t;
-void (*signal(int, void (*func)(int)))(int);
-int raise(int);
+namespace std {
+using ::raise;
+using ::sig_atomic_t;
+using ::signal;
+} // namespace std
diff --git a/cpp/common/test/includes/standard-library/cstdio b/cpp/common/test/includes/standard-library/cstdio
@@ -16,135 +16,55 @@
 #define SEEK_END -1
 #define stderr 0

-namespace std {
-struct FILE;
-typedef int fpos_t;
-
-// Operations on files
-int remove(const char *filename);
-int rename(const char *oldname, const char *newname);
-FILE *tmpfile(void);
-char *tmpnam(char *str);
-
-// File access
-int fclose(FILE *stream);
-int fflush(FILE *stream);
-FILE *fopen(const char *filename, const char *mode);
-FILE *freopen(const char *filename, const char *mode, FILE *stream);
-void setbuf(FILE *stream, char *buffer);
-int setvbuf(FILE *stream, char *buffer, int mode, size_t size);
-
-// Formatted input/output
-int fprintf(FILE *stream, const char *format, ...);
-int fscanf(FILE *stream, const char *format, ...);
-int printf(const char *format, ...);
-int scanf(const char *format, ...);
-int snprintf(char *s, size_t n, const char *format, ...);
-int sprintf(char *str, const char *format, ...);
-int sscanf(const char *s, const char *format, ...);
-/*
-int vfprintf ( FILE * stream, const char * format, va_list arg );
-int vfscanf ( FILE * stream, const char * format, va_list arg );
-int vprintf ( const char * format, va_list arg );
-int vscanf ( const char * format, va_list arg );
-int vsnprintf (char * s, size_t n, const char * format, va_list arg );
-int vsprintf (char * s, const char * format, va_list arg );
-int vsscanf ( const char * s, const char * format, va_list arg );
-*/
-
-// Character input/output
-int fgetc(FILE *stream);
-char *fgets(char *str, int num, FILE *stream);
-int fputc(int character, FILE *stream);
-int fputs(const char *str, FILE *stream);
-int getc(FILE *stream);
-int getchar(void);
-char *gets(char *str);
-int putc(int character, FILE *stream);
-int putchar(int character);
-int puts(const char *str);
-int ungetc(int character, FILE *stream);
-
-// Direct input/output
-size_t fread(void *ptr, size_t size, size_t count, FILE *stream);
-size_t fwrite(const void *ptr, size_t size, size_t count, FILE *stream);
-
-// File positioning
-int fgetpos(FILE *stream, fpos_t *pos);
-int fseek(FILE *stream, long int offset, int origin);
-int fsetpos(FILE *stream, const fpos_t *pos);
-long int ftell(FILE *stream);
-void rewind(FILE *stream);
-
-// Error-handling
-void clearerr(FILE *stream);
-int feof(FILE *stream);
-int ferror(FILE *stream);
-void perror(const char *str);
-} // namespace std
+#include <stdio.h>

-// global namespace
-struct FILE;
-typedef int fpos_t;
-
-// Operations on files
-int remove(const char *filename);
-int rename(const char *oldname, const char *newname);
-FILE *tmpfile(void);
-char *tmpnam(char *str);
-
-// File access
-int fclose(FILE *stream);
-int fflush(FILE *stream);
-FILE *fopen(const char *filename, const char *mode);
-FILE *freopen(const char *filename, const char *mode, FILE *stream);
-void setbuf(FILE *stream, char *buffer);
-int setvbuf(FILE *stream, char *buffer, int mode, size_t size);
-
-// Formatted input/output
-int fprintf(FILE *stream, const char *format, ...);
-int fscanf(FILE *stream, const char *format, ...);
-int printf(const char *format, ...);
-int scanf(const char *format, ...);
-int snprintf(char *s, size_t n, const char *format, ...);
-int sprintf(char *str, const char *format, ...);
-int sscanf(const char *s, const char *format, ...);
-/*
-int vfprintf ( FILE * stream, const char * format, va_list arg );
-int vfscanf ( FILE * stream, const char * format, va_list arg );
-int vprintf ( const char * format, va_list arg );
-int vscanf ( const char * format, va_list arg );
-int vsnprintf (char * s, size_t n, const char * format, va_list arg );
-int vsprintf (char * s, const char * format, va_list arg );
-int vsscanf ( const char * s, const char * format, va_list arg );
-*/
-
-// Character input/output
-int fgetc(FILE *stream);
-char *fgets(char *str, int num, FILE *stream);
-int fputc(int character, FILE *stream);
-int fputs(const char *str, FILE *stream);
-int getc(FILE *stream);
-int getchar(void);
-char *gets(char *str);
-int putc(int character, FILE *stream);
-int putchar(int character);
-int puts(const char *str);
-int ungetc(int character, FILE *stream);
-
-// Direct input/output
-size_t fread(void *ptr, size_t size, size_t count, FILE *stream);
-size_t fwrite(const void *ptr, size_t size, size_t count, FILE *stream);
-
-// File positioning
-int fgetpos(FILE *stream, fpos_t *pos);
-int fseek(FILE *stream, long int offset, int origin);
-int fsetpos(FILE *stream, const fpos_t *pos);
-long int ftell(FILE *stream);
-void rewind(FILE *stream);
-
-// Error-handling
-void clearerr(FILE *stream);
-int feof(FILE *stream);
-int ferror(FILE *stream);
-void perror(const char *str);
+namespace std {
+using ::FILE;
+using ::fpos_t;
+
+using ::remove;
+using ::rename;
+using ::tmpfile;
+using ::tmpnam;
+
+using ::fclose;
+using ::fflush;
+using ::fopen;
+using ::freopen;
+using ::setbuf;
+using ::setvbuf;
+
+using ::fprintf;
+using ::fscanf;
+using ::printf;
+using ::scanf;
+using ::snprintf;
+using ::sprintf;
+using ::sscanf;
+
+using ::fgetc;
+using ::fgets;
+using ::fputc;
+using ::fputs;
+using ::getc;
+using ::getchar;
+using ::gets;
+using ::putc;
+using ::putchar;
+using ::puts;
+using ::ungetc;
+
+using ::fread;
+using ::fwrite;
+
+using ::fgetpos;
+using ::fseek;
+using ::fsetpos;
+using ::ftell;
+using ::rewind;
+
+using ::clearerr;
+using ::feof;
+using ::ferror;
+using ::perror;
+} // namespace std
diff --git a/cpp/common/test/includes/standard-library/cstdlib.h b/cpp/common/test/includes/standard-library/cstdlib.h
@@ -7,10 +7,10 @@ namespace std {
 [[noreturn]] void quick_exit(int status) noexcept;
 extern "C++" int atexit(void (*f)(void)) noexcept;
 extern "C++" int at_quick_exit(void (*f)(void)) noexcept;
-extern "C++" long rand() noexcept;
 using ::atof;
 using ::atoi;
 using ::atol;
 using ::atoll;
+using ::rand;
 } // namespace std
 #endif // _GHLIBCPP_CSTDLIB
diff --git a/cpp/common/test/includes/standard-library/locale.h b/cpp/common/test/includes/standard-library/locale.h
@@ -0,0 +1,8 @@
+#ifndef _GHLIBCPP_LOCALE
+#define _GHLIBCPP_LOCALE
+
+struct lconv;
+char *setlocale(int, const char *);
+lconv *localeconv();
+
+#endif // _GHLIBCPP_LOCALE
diff --git a/cpp/common/test/includes/standard-library/signal.h b/cpp/common/test/includes/standard-library/signal.h
@@ -0,0 +1,8 @@
+#ifndef _GHLIBCPP_SIGNAL
+#define _GHLIBCPP_SIGNAL
+
+typedef int sig_atomic_t;
+void (*signal(int, void (*func)(int)))(int);
+int raise(int);
+
+#endif // _GHLIBCPP_SIGNAL
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		* `A14-7-2` - alert messages have been slightly adjusted to refer only to the base name of a file, not the full relative path.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		\| test.cpp:9:32:9:51 \| offsetof(__typ,__id) \| Use of banned macro offsetof. \|