about summary refs log tree commit diff stats
path: root/WWW/Library/Implementation/HTAABrow.c
diff options
context:
space:
mode:
Diffstat (limited to 'WWW/Library/Implementation/HTAABrow.c')
-rw-r--r--WWW/Library/Implementation/HTAABrow.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/WWW/Library/Implementation/HTAABrow.c b/WWW/Library/Implementation/HTAABrow.c
index 519030fa..02db254c 100644
--- a/WWW/Library/Implementation/HTAABrow.c
+++ b/WWW/Library/Implementation/HTAABrow.c
@@ -649,7 +649,7 @@ PRIVATE char *compose_auth_string ARGS3(
 		     realm->realmname,
 		     (IsProxy ? "proxy" : "server"),
 		     (theHost ? theHost : "??"),
-		     (thePort ? thePort : ""));
+		     NonNull(thePort));
 	FREE(proxiedHost);
 	FREE(thePort);
 	username = realm->username;
@@ -676,8 +676,8 @@ PRIVATE char *compose_auth_string ARGS3(
 	}
     }
 
-    len = strlen(realm->username ? realm->username : "") +
-	  strlen(realm->password ? realm->password : "") + 3;
+    len = strlen(NonNull(realm->username)) +
+	  strlen(NonNull(realm->password)) + 3;
 
     if (scheme == HTAA_PUBKEY) {
 #ifdef PUBKEY
@@ -685,7 +685,7 @@ PRIVATE char *compose_auth_string ARGS3(
 	StrAllocCopy(secret_key, HTAA_generateRandomKey());
 #endif /* PUBKEY */
 	/* Room for secret key, timestamp and inet address */
-	len += strlen(secret_key ? secret_key : "") + 30;
+	len += strlen(NonNull(secret_key)) + 30;
     } else {
 	FREE(secret_key);
     }