[PATCH] inetcomm: Make several constants static

Alex Henrie alexhenrie24 at gmail.com
Mon Dec 3 22:42:54 CST 2018


Signed-off-by: Alex Henrie <alexhenrie24 at gmail.com>
---
 dlls/inetcomm/smtptransport.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/dlls/inetcomm/smtptransport.c b/dlls/inetcomm/smtptransport.c
index af11308258..d71061ed6b 100644
--- a/dlls/inetcomm/smtptransport.c
+++ b/dlls/inetcomm/smtptransport.c
@@ -281,7 +281,7 @@ static void SMTPTransport_CallbackSendHello(IInternetTransport *iface, char *pBu
     HRESULT hr;
     const char *pszHello;
     char *pszCommand;
-    const char szHostName[] = "localhost"; /* FIXME */
+    static const char szHostName[] = "localhost"; /* FIXME */
 
     TRACE("\n");
 
@@ -483,7 +483,7 @@ static void SMTPTransport_CallbackMessageSendTo(IInternetTransport *iface, char
 
         if ((This->pending_message.rAddressList.prgAddress[This->ulCurrentAddressIndex].addrtype & ADDR_TOFROM_MASK) == ADDR_TO)
         {
-            const char szCommandFormat[] = "RCPT TO: <%s>\n";
+            static const char szCommandFormat[] = "RCPT TO: <%s>\n";
             char *szCommand;
             int len = sizeof(szCommandFormat) - 2 /* "%s" */ +
                 strlen(This->pending_message.rAddressList.prgAddress[This->ulCurrentAddressIndex].szEmail);
@@ -659,10 +659,10 @@ static HRESULT WINAPI SMTPTransport_InitNew(ISMTPTransport2 *iface,
 static HRESULT WINAPI SMTPTransport_SendMessage(ISMTPTransport2 *iface,
     LPSMTPMESSAGE pMessage)
 {
+    static const char szCommandFormat[] = "MAIL FROM: <%s>\n";
     SMTPTransport *This = (SMTPTransport *)iface;
     ULONG i, size;
     LPSTR pszFromAddress = NULL;
-    const char szCommandFormat[] = "MAIL FROM: <%s>\n";
     char *szCommand;
     int len;
     HRESULT hr;
@@ -723,8 +723,8 @@ static HRESULT WINAPI SMTPTransport_SendMessage(ISMTPTransport2 *iface,
 
 static HRESULT WINAPI SMTPTransport_CommandMAIL(ISMTPTransport2 *iface, LPSTR pszEmailFrom)
 {
+    static const char szCommandFormat[] = "MAIL FROM: <%s>\n";
     SMTPTransport *This = (SMTPTransport *)iface;
-    const char szCommandFormat[] = "MAIL FROM: <%s>\n";
     char *szCommand;
     int len;
     HRESULT hr;
@@ -750,8 +750,8 @@ static HRESULT WINAPI SMTPTransport_CommandMAIL(ISMTPTransport2 *iface, LPSTR ps
 
 static HRESULT WINAPI SMTPTransport_CommandRCPT(ISMTPTransport2 *iface, LPSTR pszEmailTo)
 {
+    static const char szCommandFormat[] = "RCPT TO: <%s>\n";
     SMTPTransport *This = (SMTPTransport *)iface;
-    const char szCommandFormat[] = "RCPT TO: <%s>\n";
     char *szCommand;
     int len;
     HRESULT hr;
@@ -777,9 +777,9 @@ static HRESULT WINAPI SMTPTransport_CommandRCPT(ISMTPTransport2 *iface, LPSTR ps
 
 static HRESULT WINAPI SMTPTransport_CommandEHLO(ISMTPTransport2 *iface)
 {
+    static const char szCommandFormat[] = "EHLO %s\n";
+    static const char szHostname[] = "localhost"; /* FIXME */
     SMTPTransport *This = (SMTPTransport *)iface;
-    const char szCommandFormat[] = "EHLO %s\n";
-    const char szHostname[] = "localhost"; /* FIXME */
     char *szCommand;
     int len = sizeof(szCommandFormat) - 2 /* "%s" */ + sizeof(szHostname);
     HRESULT hr;
@@ -801,9 +801,9 @@ static HRESULT WINAPI SMTPTransport_CommandEHLO(ISMTPTransport2 *iface)
 
 static HRESULT WINAPI SMTPTransport_CommandHELO(ISMTPTransport2 *iface)
 {
+    static const char szCommandFormat[] = "HELO %s\n";
+    static const char szHostname[] = "localhost"; /* FIXME */
     SMTPTransport *This = (SMTPTransport *)iface;
-    const char szCommandFormat[] = "HELO %s\n";
-    const char szHostname[] = "localhost"; /* FIXME */
     char *szCommand;
     int len = sizeof(szCommandFormat) - 2 /* "%s" */ + sizeof(szHostname);
     HRESULT hr;
@@ -826,8 +826,8 @@ static HRESULT WINAPI SMTPTransport_CommandHELO(ISMTPTransport2 *iface)
 static HRESULT WINAPI SMTPTransport_CommandAUTH(ISMTPTransport2 *iface,
     LPSTR pszAuthType)
 {
+    static const char szCommandFormat[] = "AUTH %s\n";
     SMTPTransport *This = (SMTPTransport *)iface;
-    const char szCommandFormat[] = "AUTH %s\n";
     char *szCommand;
     int len;
     HRESULT hr;
-- 
2.19.2




More information about the wine-devel mailing list