Fixup references from httpHeaderStrncpy to httpHeaderCpy

Author: paulbartell

source/include/core_http_client_private.h

@@ -62,13 +62,13 @@
 #define NULL_CHARACTER                     '\0' /**< A NULL character to help with header validation. */
 
 /**
- * @brief Indicator for function #httpHeaderStrncpy that the pSrc parameter is a
+ * @brief Indicator for function #httpHeaderCpy that the pSrc parameter is a
  * header value.
  */
 #define HTTP_HEADER_STRNCPY_IS_VALUE       0U
 
 /**
- * @brief Indicator for function #httpHeaderStrncpy that the pSrc parameter is a
+ * @brief Indicator for function #httpHeaderCpy that the pSrc parameter is a
  * header field.
  */
 #define HTTP_HEADER_STRNCPY_IS_FIELD       1U

test/cbmc/proofs/HTTPClient_AddHeader/Makefile

@@ -45,7 +45,7 @@ REMOVE_FUNCTION_BODY += __CPROVER_file_local_core_http_client_c_httpParserOnMess
 # because HTTPClient_AddHeader does not use the results of the copy later in the
 # function.
 REMOVE_FUNCTION_BODY += strncpy
-REMOVE_FUNCTION_BODY += __CPROVER_file_local_core_http_client_c_httpHeaderStrncpy
+REMOVE_FUNCTION_BODY += __CPROVER_file_local_core_http_client_c_httpHeaderCpy
 
 # strncmp is used to find if there exists "\r\n\r\n" at the end of the header
 # buffer. Therefore, we need to unwind strncmp the length of "\r\n\r\n" + 1.
@@ -54,7 +54,7 @@ UNWINDSET += strncmp.0:5
 PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c
 PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/http_cbmc_state.c
 PROOF_SOURCES += $(SRCDIR)/test/cbmc/stubs/strncpy.c
-PROOF_SOURCES += $(SRCDIR)/test/cbmc/stubs/httpHeaderStrncpy.c
+PROOF_SOURCES += $(SRCDIR)/test/cbmc/stubs/httpHeaderCpy.c
 
 PROJECT_SOURCES += $(SRCDIR)/source/core_http_client.c
 

test/cbmc/proofs/HTTPClient_AddRangeHeader/Makefile

@@ -32,7 +32,7 @@ INCLUDES +=
 # because HTTPClient_AddRangeHeader does not use the results of the copy later
 # in the function.
 REMOVE_FUNCTION_BODY += strncpy
-REMOVE_FUNCTION_BODY += __CPROVER_file_local_core_http_client_c_httpHeaderStrncpy
+REMOVE_FUNCTION_BODY += __CPROVER_file_local_core_http_client_c_httpHeaderCpy
 
 # strncmp is used to find if there exists "\r\n\r\n" at the end of the header
 # buffer. Therefore, we need to unwind strncmp the length of "\r\n\r\n" + 1.
@@ -44,7 +44,7 @@ UNWINDSET += __CPROVER_file_local_core_http_client_c_convertInt32ToAscii.1:11
 PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c
 PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/http_cbmc_state.c
 PROOF_SOURCES += $(SRCDIR)/test/cbmc/stubs/strncpy.c
-PROOF_SOURCES += $(SRCDIR)/test/cbmc/stubs/httpHeaderStrncpy.c
+PROOF_SOURCES += $(SRCDIR)/test/cbmc/stubs/httpHeaderCpy.c
 
 PROJECT_SOURCES += $(SRCDIR)/source/core_http_client.c
 

test/cbmc/proofs/HTTPClient_InitializeRequestHeaders/Makefile

@@ -44,7 +44,7 @@ REMOVE_FUNCTION_BODY += __CPROVER_file_local_core_http_client_c_httpParserOnMess
 # because HTTPClient_InitializeRequestHeaders does not use the results of the
 # copy later in the function.
 REMOVE_FUNCTION_BODY += strncpy
-REMOVE_FUNCTION_BODY += __CPROVER_file_local_core_http_client_c_httpHeaderStrncpy
+REMOVE_FUNCTION_BODY += __CPROVER_file_local_core_http_client_c_httpHeaderCpy
 
 # strncmp is used to find if there exists "\r\n\r\n" at the end of the header
 # buffer. Therefore, we need to unwind strncmp the length of "\r\n\r\n" + 1.
@@ -53,7 +53,7 @@ UNWINDSET += strncmp.0:5
 PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c
 PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/http_cbmc_state.c
 PROOF_SOURCES += $(SRCDIR)/test/cbmc/stubs/strncpy.c
-PROOF_SOURCES += $(SRCDIR)/test/cbmc/stubs/httpHeaderStrncpy.c
+PROOF_SOURCES += $(SRCDIR)/test/cbmc/stubs/httpHeaderCpy.c
 
 PROJECT_SOURCES += $(SRCDIR)/source/core_http_client.c
 

test/cbmc/proofs/HTTPClient_Send/Makefile

@@ -52,7 +52,7 @@ REMOVE_FUNCTION_BODY += http_parser_settings_init
 # because all of the functions, in HTTPClient_Send, that would have used the
 # results of the copy are stubbed out to be proven separately.
 REMOVE_FUNCTION_BODY += strncpy
-REMOVE_FUNCTION_BODY += __CPROVER_file_local_core_http_client_c_httpHeaderStrncpy
+REMOVE_FUNCTION_BODY += __CPROVER_file_local_core_http_client_c_httpHeaderCpy
 
 # There is a total of 10 digits in INT32_MAX. These loops are unwound once more
 # than the total possible iterations in the int32_t to ASCII converation.
@@ -71,7 +71,7 @@ PROOF_SOURCES += $(SRCDIR)/test/cbmc/stubs/HTTPClient_Send_http_parser_execute.c
 PROOF_SOURCES += $(SRCDIR)/test/cbmc/stubs/transport_interface_stubs.c
 PROOF_SOURCES += $(SRCDIR)/test/cbmc/stubs/get_time_stub.c
 PROOF_SOURCES += $(SRCDIR)/test/cbmc/stubs/strncpy.c
-PROOF_SOURCES += $(SRCDIR)/test/cbmc/stubs/httpHeaderStrncpy.c
+PROOF_SOURCES += $(SRCDIR)/test/cbmc/stubs/httpHeaderCpy.c
 
 PROJECT_SOURCES += $(SRCDIR)/source/core_http_client.c
 

test/cbmc/stubs/httpHeaderStrncpy.c test/cbmc/stubs/httpHeaderCpy.ctest/cbmc/stubs/httpHeaderStrncpy.c renamed to test/cbmc/stubs/httpHeaderCpy.c

@@ -21,8 +21,8 @@
  */
 
 /**
- * @file httpHeaderStrncpy.c
- * @brief Creates a stub for httpHeaderStrncpy so that the proofs for
+ * @file httpHeaderCpy.c
+ * @brief Creates a stub for httpHeaderCpy so that the proofs for
  * HTTPClient_AddHeader, HTTPClient_AddRangeHeader, and
  * HTTPClient_InitializeRequestHeaders run much faster. This stub checks if, for
  * the input copy length, the destination and source are valid accessible
@@ -32,10 +32,10 @@
 #include <string.h>
 #include <stdint.h>
 
-void * httpHeaderStrncpy( char * pDest,
-                          const char * pSrc,
-                          size_t len,
-                          uint8_t isField )
+void * httpHeaderCpy( char * pDest,
+                      const char * pSrc,
+                      size_t len,
+                      uint8_t isField )
 {
     __CPROVER_assert( __CPROVER_w_ok( pDest, len ), "write" );
     __CPROVER_assert( __CPROVER_r_ok( pSrc, len ), "read" );