Remove redundant rc changes

aidangarske · aidangarske · commit 38350aa4a085 · 2026-02-20T21:02:10.000Z
diff --git a/examples/bench/bench.c b/examples/bench/bench.c
@@ -263,7 +263,7 @@ int TPM2_Wrapper_BenchArgs(void* userCtx, int argc, char *argv[])
     /* Init the TPM2 device */
     rc = wolfTPM2_Init(&dev, TPM2_IoCb, userCtx);
     if (rc != 0) {
-        printf("wolfTPM2_Init failed 0x%x: %s\n", rc, TPM2_GetRCString(rc));
+        printf("wolfTPM2_Init failed\n");
         return rc;
     }
 
diff --git a/examples/boot/secure_rot.c b/examples/boot/secure_rot.c
@@ -175,7 +175,7 @@ int TPM2_Boot_SecureROT_Example(void* userCtx, int argc, char *argv[])
 
     rc = wolfTPM2_Init(&dev, TPM2_IoCb, userCtx);
     if (rc != TPM_RC_SUCCESS) {
-        printf("\nwolfTPM2_Init failed 0x%x: %s\n", rc, TPM2_GetRCString(rc));
+        printf("\nwolfTPM2_Init failed\n");
         goto exit;
     }
 
diff --git a/examples/gpio/gpio_read.c b/examples/gpio/gpio_read.c
@@ -78,7 +78,7 @@ int TPM2_GPIO_Read_Example(void* userCtx, int argc, char *argv[])
 
     rc = wolfTPM2_Init(&dev, TPM2_IoCb, userCtx);
     if (rc != TPM_RC_SUCCESS) {
-        printf("\nwolfTPM2_Init failed 0x%x: %s\n", rc, TPM2_GetRCString(rc));
+        printf("\nwolfTPM2_Init failed\n");
         goto exit;
     }
 
diff --git a/examples/gpio/gpio_set.c b/examples/gpio/gpio_set.c
@@ -91,7 +91,7 @@ int TPM2_GPIO_Set_Example(void* userCtx, int argc, char *argv[])
 
     rc = wolfTPM2_Init(&dev, TPM2_IoCb, userCtx);
     if (rc != TPM_RC_SUCCESS) {
-        printf("\nwolfTPM2_Init failed 0x%x: %s\n", rc, TPM2_GetRCString(rc));
+        printf("\nwolfTPM2_Init failed\n");
         goto exit;
     }
 
diff --git a/examples/keygen/create_primary.c b/examples/keygen/create_primary.c
@@ -180,7 +180,7 @@ int TPM2_CreatePrimaryKey_Example(void* userCtx, int argc, char *argv[])
 
     rc = wolfTPM2_Init(&dev, TPM2_IoCb, userCtx);
     if (rc != TPM_RC_SUCCESS) {
-        printf("\nwolfTPM2_Init failed 0x%x: %s\n", rc, TPM2_GetRCString(rc));
+        printf("\nwolfTPM2_Init failed\n");
         goto exit;
     }
 
diff --git a/examples/keygen/keygen.c b/examples/keygen/keygen.c
@@ -244,7 +244,7 @@ int TPM2_Keygen_Example(void* userCtx, int argc, char *argv[])
 
     rc = wolfTPM2_Init(&dev, TPM2_IoCb, userCtx);
     if (rc != TPM_RC_SUCCESS) {
-        printf("\nwolfTPM2_Init failed 0x%x: %s\n", rc, TPM2_GetRCString(rc));
+        printf("\nwolfTPM2_Init failed\n");
         goto exit;
     }
 
diff --git a/examples/keygen/keyimport.c b/examples/keygen/keyimport.c
@@ -155,7 +155,7 @@ int TPM2_Keyimport_Example(void* userCtx, int argc, char *argv[])
 
     rc = wolfTPM2_Init(&dev, TPM2_IoCb, userCtx);
     if (rc != TPM_RC_SUCCESS) {
-        printf("\nwolfTPM2_Init failed 0x%x: %s\n", rc, TPM2_GetRCString(rc));
+        printf("\nwolfTPM2_Init failed\n");
         goto exit;
     }
 
diff --git a/examples/keygen/keyload.c b/examples/keygen/keyload.c
@@ -118,7 +118,7 @@ int TPM2_Keyload_Example(void* userCtx, int argc, char *argv[])
 
     rc = wolfTPM2_Init(&dev, TPM2_IoCb, userCtx);
     if (rc != TPM_RC_SUCCESS) {
-        printf("\nwolfTPM2_Init failed 0x%x: %s\n", rc, TPM2_GetRCString(rc));
+        printf("\nwolfTPM2_Init failed\n");
         goto exit;
     }
 
diff --git a/examples/nvram/counter.c b/examples/nvram/counter.c
@@ -125,7 +125,7 @@ int TPM2_NVRAM_Counter_Example(void* userCtx, int argc, char *argv[])
 
     rc = wolfTPM2_Init(&dev, TPM2_IoCb, userCtx);
     if (rc != TPM_RC_SUCCESS) {
-        printf("wolfTPM2_Init failed 0x%x: %s\n", rc, TPM2_GetRCString(rc));
+        printf("wolfTPM2_Init failed\n");
         goto exit;
     }
 
diff --git a/examples/nvram/extend.c b/examples/nvram/extend.c
@@ -153,7 +153,7 @@ int TPM2_NVRAM_Extend_Example(void* userCtx, int argc, char *argv[])
 
     rc = wolfTPM2_Init(&dev, TPM2_IoCb, userCtx);
     if (rc != TPM_RC_SUCCESS) {
-        printf("wolfTPM2_Init failed 0x%x: %s\n", rc, TPM2_GetRCString(rc));
+        printf("wolfTPM2_Init failed\n");
         goto exit;
     }
 
diff --git a/examples/nvram/policy_nv.c b/examples/nvram/policy_nv.c
@@ -147,7 +147,7 @@ int TPM2_NVRAM_PolicyNV_Example(void* userCtx, int argc, char *argv[])
 
     rc = wolfTPM2_Init(&dev, TPM2_IoCb, userCtx);
     if (rc != TPM_RC_SUCCESS) {
-        printf("\nwolfTPM2_Init failed 0x%x: %s\n", rc, TPM2_GetRCString(rc));
+        printf("\nwolfTPM2_Init failed\n");
         goto exit;
     }
 
diff --git a/examples/nvram/read.c b/examples/nvram/read.c
@@ -156,7 +156,7 @@ int TPM2_NVRAM_Read_Example(void* userCtx, int argc, char *argv[])
 
     rc = wolfTPM2_Init(&dev, TPM2_IoCb, userCtx);
     if (rc != TPM_RC_SUCCESS) {
-        printf("\nwolfTPM2_Init failed 0x%x: %s\n", rc, TPM2_GetRCString(rc));
+        printf("\nwolfTPM2_Init failed\n");
         goto exit;
     }
 
diff --git a/examples/nvram/store.c b/examples/nvram/store.c
@@ -147,7 +147,7 @@ int TPM2_NVRAM_Store_Example(void* userCtx, int argc, char *argv[])
 
     rc = wolfTPM2_Init(&dev, TPM2_IoCb, userCtx);
     if (rc != TPM_RC_SUCCESS) {
-        printf("\nwolfTPM2_Init failed 0x%x: %s\n", rc, TPM2_GetRCString(rc));
+        printf("\nwolfTPM2_Init failed\n");
         goto exit;
     }
 
diff --git a/examples/pkcs7/pkcs7.c b/examples/pkcs7/pkcs7.c
@@ -418,7 +418,7 @@ int TPM2_PKCS7_ExampleArgs(void* userCtx, int argc, char *argv[])
     /* Init the TPM2 device */
     rc = wolfTPM2_Init(&dev, TPM2_IoCb, userCtx);
     if (rc != 0) {
-        printf("wolfTPM2_Init failed 0x%x: %s\n", rc, TPM2_GetRCString(rc));
+        printf("wolfTPM2_Init failed\n");
         return rc;
     }
 
diff --git a/examples/seal/seal.c b/examples/seal/seal.c
@@ -104,7 +104,7 @@ int TPM2_Seal_Example(void* userCtx, int argc, char *argv[])
 
     rc = wolfTPM2_Init(&dev, TPM2_IoCb, userCtx);
     if (rc != TPM_RC_SUCCESS) {
-        printf("\nwolfTPM2_Init failed 0x%x: %s\n", rc, TPM2_GetRCString(rc));
+        printf("\nwolfTPM2_Init failed\n");
         goto exit;
     }
 
diff --git a/examples/wrap/caps.c b/examples/wrap/caps.c
@@ -107,7 +107,7 @@ int TPM2_Wrapper_CapsArgs(void* userCtx, int argc, char *argv[])
     /* Init the TPM2 device */
     rc = wolfTPM2_Init(&dev, TPM2_IoCb, userCtx);
     if (rc != 0) {
-        printf("wolfTPM2_Init failed 0x%x: %s\n", rc, TPM2_GetRCString(rc));
+        printf("wolfTPM2_Init failed\n");
         return rc;
     }
 
diff --git a/examples/wrap/wrap_test.c b/examples/wrap/wrap_test.c
@@ -169,7 +169,7 @@ int TPM2_Wrapper_TestArgs(void* userCtx, int argc, char *argv[])
     /* Init the TPM2 device */
     rc = wolfTPM2_Init(&dev, TPM2_IoCb, userCtx);
     if (rc != 0) {
-        printf("wolfTPM2_Init failed 0x%x: %s\n", rc, TPM2_GetRCString(rc));
+        printf("wolfTPM2_Init failed\n");
         return rc;
     }
 
diff --git a/src/tpm2_wrap.c b/src/tpm2_wrap.c
@@ -74,7 +74,7 @@ static int wolfTPM2_Init_ex(TPM2_CTX* ctx, TPM2HalIoCb ioCb, void* userCtx,
     rc = TPM2_Init_ex(ctx, ioCb, userCtx, timeoutTries);
 #endif
     if (rc != TPM_RC_SUCCESS) {
-        printf("TPM2_Init failed %d: %s\n", rc, wolfTPM2_GetRCString(rc));
+        printf("TPM2_Init failed 0x%x: %s\n", rc, wolfTPM2_GetRCString(rc));
         return rc;
     }
 #ifdef DEBUG_WOLFTPM

Original file line number	Diff line number	Diff line change
`@@ -263,7 +263,7 @@ int TPM2_Wrapper_BenchArgs(void* userCtx, int argc, char *argv[])`
`263`	`263`	`/* Init the TPM2 device */`
`264`	`264`	`rc = wolfTPM2_Init(&dev, TPM2_IoCb, userCtx);`
`265`	`265`	`if (rc != 0) {`
`266`		`- printf("wolfTPM2_Init failed 0x%x: %s\n", rc, TPM2_GetRCString(rc));`
	`266`	`+ printf("wolfTPM2_Init failed\n");`
`267`	`267`	`return rc;`
`268`	`268`	`}`
`269`	`269`
Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@ int TPM2_Boot_SecureROT_Example(void* userCtx, int argc, char *argv[])`
`175`	`175`
`176`	`176`	`rc = wolfTPM2_Init(&dev, TPM2_IoCb, userCtx);`
`177`	`177`	`if (rc != TPM_RC_SUCCESS) {`
`178`		`- printf("\nwolfTPM2_Init failed 0x%x: %s\n", rc, TPM2_GetRCString(rc));`
	`178`	`+ printf("\nwolfTPM2_Init failed\n");`
`179`	`179`	`goto exit;`
`180`	`180`	`}`
`181`	`181`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ int TPM2_GPIO_Read_Example(void* userCtx, int argc, char *argv[])`
`78`	`78`
`79`	`79`	`rc = wolfTPM2_Init(&dev, TPM2_IoCb, userCtx);`
`80`	`80`	`if (rc != TPM_RC_SUCCESS) {`
`81`		`- printf("\nwolfTPM2_Init failed 0x%x: %s\n", rc, TPM2_GetRCString(rc));`
	`81`	`+ printf("\nwolfTPM2_Init failed\n");`
`82`	`82`	`goto exit;`
`83`	`83`	`}`
`84`	`84`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ int TPM2_GPIO_Set_Example(void* userCtx, int argc, char *argv[])`
`91`	`91`
`92`	`92`	`rc = wolfTPM2_Init(&dev, TPM2_IoCb, userCtx);`
`93`	`93`	`if (rc != TPM_RC_SUCCESS) {`
`94`		`- printf("\nwolfTPM2_Init failed 0x%x: %s\n", rc, TPM2_GetRCString(rc));`
	`94`	`+ printf("\nwolfTPM2_Init failed\n");`
`95`	`95`	`goto exit;`
`96`	`96`	`}`
`97`	`97`
Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ int TPM2_CreatePrimaryKey_Example(void* userCtx, int argc, char *argv[])`
`180`	`180`
`181`	`181`	`rc = wolfTPM2_Init(&dev, TPM2_IoCb, userCtx);`
`182`	`182`	`if (rc != TPM_RC_SUCCESS) {`
`183`		`- printf("\nwolfTPM2_Init failed 0x%x: %s\n", rc, TPM2_GetRCString(rc));`
	`183`	`+ printf("\nwolfTPM2_Init failed\n");`
`184`	`184`	`goto exit;`
`185`	`185`	`}`
`186`	`186`
Original file line number	Diff line number	Diff line change
`@@ -244,7 +244,7 @@ int TPM2_Keygen_Example(void* userCtx, int argc, char *argv[])`
`244`	`244`
`245`	`245`	`rc = wolfTPM2_Init(&dev, TPM2_IoCb, userCtx);`
`246`	`246`	`if (rc != TPM_RC_SUCCESS) {`
`247`		`- printf("\nwolfTPM2_Init failed 0x%x: %s\n", rc, TPM2_GetRCString(rc));`
	`247`	`+ printf("\nwolfTPM2_Init failed\n");`
`248`	`248`	`goto exit;`
`249`	`249`	`}`
`250`	`250`
Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ int TPM2_Keyimport_Example(void* userCtx, int argc, char *argv[])`
`155`	`155`
`156`	`156`	`rc = wolfTPM2_Init(&dev, TPM2_IoCb, userCtx);`
`157`	`157`	`if (rc != TPM_RC_SUCCESS) {`
`158`		`- printf("\nwolfTPM2_Init failed 0x%x: %s\n", rc, TPM2_GetRCString(rc));`
	`158`	`+ printf("\nwolfTPM2_Init failed\n");`
`159`	`159`	`goto exit;`
`160`	`160`	`}`
`161`	`161`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ int TPM2_Keyload_Example(void* userCtx, int argc, char *argv[])`
`118`	`118`
`119`	`119`	`rc = wolfTPM2_Init(&dev, TPM2_IoCb, userCtx);`
`120`	`120`	`if (rc != TPM_RC_SUCCESS) {`
`121`		`- printf("\nwolfTPM2_Init failed 0x%x: %s\n", rc, TPM2_GetRCString(rc));`
	`121`	`+ printf("\nwolfTPM2_Init failed\n");`
`122`	`122`	`goto exit;`
`123`	`123`	`}`
`124`	`124`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ int TPM2_NVRAM_Counter_Example(void* userCtx, int argc, char *argv[])`
`125`	`125`
`126`	`126`	`rc = wolfTPM2_Init(&dev, TPM2_IoCb, userCtx);`
`127`	`127`	`if (rc != TPM_RC_SUCCESS) {`
`128`		`- printf("wolfTPM2_Init failed 0x%x: %s\n", rc, TPM2_GetRCString(rc));`
	`128`	`+ printf("wolfTPM2_Init failed\n");`
`129`	`129`	`goto exit;`
`130`	`130`	`}`
`131`	`131`
Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ int TPM2_NVRAM_Extend_Example(void* userCtx, int argc, char *argv[])`
`153`	`153`
`154`	`154`	`rc = wolfTPM2_Init(&dev, TPM2_IoCb, userCtx);`
`155`	`155`	`if (rc != TPM_RC_SUCCESS) {`
`156`		`- printf("wolfTPM2_Init failed 0x%x: %s\n", rc, TPM2_GetRCString(rc));`
	`156`	`+ printf("wolfTPM2_Init failed\n");`
`157`	`157`	`goto exit;`
`158`	`158`	`}`
`159`	`159`