Merge pull request #4535 from MugBergerFries/patch-13

Updated C6504, C28285

Author: colin-home

docs/code-quality/c28285.md

@@ -1,35 +1,37 @@
 ---
 description: "Learn more about: C28285"
 title: C28285
-ms.date: 12/17/2019
+ms.date: 09/22/2022
 ms.topic: reference
-f1_keywords: ["C28285"]
+f1_keywords: ["C28285", "SPEC_INVALID_SYNTAX2", "__WARNING_SPEC_INVALID_SYNTAX2"]
 helpviewer_keywords: ["C28285"]
 ms.assetid: 6197eb0f-7e1e-4c3e-b097-1f6481405994
 ---
-# C28285
+# Warning C28285
 
-> warning C28285: For function 'function_name', syntax error in 'annotation'
+> For function '*function-name*', syntax error in '*annotation*'
 
-The Code Analysis tool reports this warning for syntax errors in the SAL annotation.  The SAL parser will recover by discarding the malformed annotation.
+## Remarks
+
+The Code Analysis tool reports this warning for syntax errors in the SAL annotation. The SAL parser will recover by discarding the malformed annotation. Double check the documentation for the SAL annotations being used and try to simplify the annotation. You shouldn't use implementation layer annotations such as `__declspec("SAL_begin")` directly. If you're using that layer, then change them into higher layers such as `_In_`/`_Out_`/`_Ret_`. For more information, see [Annotating Function Parameters and Return Values](annotating-function-parameters-and-return-values.md).
 
 ## Example
 
+The following code generates this warning. The argument `(2,n)` is malformed and will cause a C28285 warning after the `_Out_writes_z_` macro is expanded.
+
 ```cpp
-// The argument '(n,2)' is malformed and will cause a C28285 warning after the _Out_writes_z_ macro is expanded.
 void example_func(_Out_writes_z_((2,n)) char* buffer, int n)
 {
-  // ...
-  buffer[n] = '\0';
+    buffer[n] = '\0';
 }
 ```
 
-Double check the documentation to the SAL annotations being used and try to simplify the annotation.  You should not use implementation layer annotations such as `__declspec("SAL_begin")` directly. If you are using that layer then change them into higher layers such as `_In_`/`_Out_`/`_Ret_`.  See [Annotating Function Parameters and Return Values](annotating-function-parameters-and-return-values.md) for more information.
+The following code remediates this warning by correcting the malformed annotation
 
 ```cpp
 void example_func(_Out_writes_z_(n) char* buffer, int n)
 {
-  // ...
-  buffer[n] = '\0';
+    buffer[n] = '\0';
 }
 ```
+

docs/code-quality/c6504.md

@@ -1,60 +1,60 @@
 ---
 description: "Learn more about: C6504"
 title: C6504
-ms.date: 12/19/2019
+ms.date: 09/22/2022
 ms.topic: reference
-f1_keywords: ["C6504"]
+f1_keywords: ["C6504", "NULL_ON_NON_POINTER", "__WARNING_NULL_ON_NON_POINTER"]
 helpviewer_keywords: ["C6504"]
 ms.assetid: 6baeed46-e73d-4974-af16-7487c55b3473
 ---
 # C6504
 
-> warning C6504: invalid annotation: property may only be used on values of pointer, pointer-to-member, or array type
+> Invalid annotation: property may only be used on values of pointer, pointer-to-member, or array type
 
-This warning indicates the use of a pointer-specific SAL annotation on a non-pointer data type. For more information about what data types are supported by properties, see [Annotation Properties](using-sal-annotations-to-reduce-c-cpp-code-defects.md).
+This warning indicates the use of a pointer-specific SAL annotation on a non-pointer data type.
+
+## Remarks
+
+For more information about what data types are supported by properties, see [Annotation Properties](using-sal-annotations-to-reduce-c-cpp-code-defects.md).
+
+Code analysis name: NULL_ON_NON_POINTER
 
 ## Example
 
-```cpp
-#include<sal.h>
+The following code generates this warning. This issue stems from the use of the pointer-specific `_Maybenull_` and `_Notnull_` on reference `pt`.
 
+```cpp
 class Point
 {
-public:
-    //  members
+    public:
+        //  members
 };
 
-// Oops, according to this annotation, pt may be null which does not make sense for a reference types
 void f(_Pre_ _Maybenull_ Point& pt)
 {
     // code ...
 }
 
-// Oops, according to this annotation, pt cannot be null which does not make sense for a reference types
 void g(_Pre_ _Notnull_ Point& pt)
 {
     // code ...
 }
 ```
 
-To correct this warning remove the annotation if it does not make sense.  You could also change to an annotation to be applicable to the type used, or change to type to match the annotation.
+To correct this warning, remove the annotation if it doesn't make sense. You could also change to an annotation to be applicable to the type used, or change the type to match the annotation. The following code remediates this warning by changing the first instance of `pt` to a pointer and by removing the second annotation to match the reference type.
 
 ```cpp
-#include<sal.h>
-
 class Point
 {
-public:
-    //  members
+    public:
+        //  members
 };
 
-// Changed to pointer type because it may be null
 void f(_Pre_ _Maybenull_  Point* pt)
 {
     // code ...
 }
 
-// Removed annotation because it did not apply to reference types.
 void g(Point& pt)
 {
     // code ...