150dd8b7039cd2c5ef1b89782542135b7dc9896a
angie
Wed Jun 27 09:15:22 2012 -0700
Fixing stricter gcc compile warnings: use safecpy instead of safef when there is no format string ("%s").
diff --git src/hg/hgLogin/hgLogin.c src/hg/hgLogin/hgLogin.c
index 066f88a..5d4abea 100644
--- src/hg/hgLogin/hgLogin.c
+++ src/hg/hgLogin/hgLogin.c
@@ -1195,34 +1195,34 @@
"document.cookie = \"wikidb_mw1_UserName=; domain=%s; expires=Thu, 01-Jan-70 00:00:01 GMT; path=/\"; "
"\n"
"document.cookie = \"wikidb_mw1_UserID=; domain=%s; expires=Thu, 01-Jan-70 00:00:01 GMT; path=/\";"
"</script>\n", domainName, domainName);
/* return to "returnto" URL */
returnToURL(150);
}
void doMiddle(struct cart *theCart)
/* Write the middle parts of the HTML page.
* This routine sets up some globals and then
* dispatches to the appropriate page-maker. */
{
struct sqlConnection *conn = hConnectCentral();
cart = theCart;
-safef(brwName,sizeof(brwName), browserName());
-safef(brwAddr,sizeof(brwAddr), browserAddr());
-safef(signature,sizeof(signature), mailSignature());
-safef(returnAddr,sizeof(returnAddr), mailReturnAddr());
+safecpy(brwName,sizeof(brwName), browserName());
+safecpy(brwAddr,sizeof(brwAddr), browserAddr());
+safecpy(signature,sizeof(signature), mailSignature());
+safecpy(returnAddr,sizeof(returnAddr), mailReturnAddr());
if (cartVarExists(cart, "hgLogin.do.changePasswordPage"))
changePasswordPage(conn);
else if (cartVarExists(cart, "hgLogin.do.changePassword"))
changePassword(conn);
else if (cartVarExists(cart, "hgLogin.do.displayAccHelpPage"))
displayAccHelpPage(conn);
else if (cartVarExists(cart, "hgLogin.do.accountHelp"))
accountHelp(conn);
else if (cartVarExists(cart, "hgLogin.do.activateAccount"))
activateAccount(conn);
else if (cartVarExists(cart, "hgLogin.do.displayActMailSuccess"))
displayActMailSuccess();
else if (cartVarExists(cart, "hgLogin.do.displayMailSuccess"))
displayMailSuccess();