Fossil SCM
clean up a few compiler warnings
Commit
97789f0a928d11a3d78f30e243e1690c295e1617
Parent
5d16ca43f192395…
2 files changed
+2
-1
+1
-1
+2
-1
| --- src/main.c | ||
| +++ src/main.c | ||
| @@ -735,11 +735,11 @@ | ||
| 735 | 735 | void cmd_test_http(void){ |
| 736 | 736 | login_set_capabilities("s"); |
| 737 | 737 | cmd_http(); |
| 738 | 738 | } |
| 739 | 739 | |
| 740 | - | |
| 740 | +#ifndef __MINGW32__ | |
| 741 | 741 | #if !defined(__DARWIN__) && !defined(__APPLE__) |
| 742 | 742 | /* |
| 743 | 743 | ** Search for an executable on the PATH environment variable. |
| 744 | 744 | ** Return true (1) if found and false (0) if not found. |
| 745 | 745 | */ |
| @@ -757,10 +757,11 @@ | ||
| 757 | 757 | if( bExists==0 ) return 1; |
| 758 | 758 | zPath += i; |
| 759 | 759 | } |
| 760 | 760 | return 0; |
| 761 | 761 | } |
| 762 | +#endif | |
| 762 | 763 | #endif |
| 763 | 764 | |
| 764 | 765 | /* |
| 765 | 766 | ** COMMAND: server |
| 766 | 767 | ** COMMAND: ui |
| 767 | 768 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -735,11 +735,11 @@ | |
| 735 | void cmd_test_http(void){ |
| 736 | login_set_capabilities("s"); |
| 737 | cmd_http(); |
| 738 | } |
| 739 | |
| 740 | |
| 741 | #if !defined(__DARWIN__) && !defined(__APPLE__) |
| 742 | /* |
| 743 | ** Search for an executable on the PATH environment variable. |
| 744 | ** Return true (1) if found and false (0) if not found. |
| 745 | */ |
| @@ -757,10 +757,11 @@ | |
| 757 | if( bExists==0 ) return 1; |
| 758 | zPath += i; |
| 759 | } |
| 760 | return 0; |
| 761 | } |
| 762 | #endif |
| 763 | |
| 764 | /* |
| 765 | ** COMMAND: server |
| 766 | ** COMMAND: ui |
| 767 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -735,11 +735,11 @@ | |
| 735 | void cmd_test_http(void){ |
| 736 | login_set_capabilities("s"); |
| 737 | cmd_http(); |
| 738 | } |
| 739 | |
| 740 | #ifndef __MINGW32__ |
| 741 | #if !defined(__DARWIN__) && !defined(__APPLE__) |
| 742 | /* |
| 743 | ** Search for an executable on the PATH environment variable. |
| 744 | ** Return true (1) if found and false (0) if not found. |
| 745 | */ |
| @@ -757,10 +757,11 @@ | |
| 757 | if( bExists==0 ) return 1; |
| 758 | zPath += i; |
| 759 | } |
| 760 | return 0; |
| 761 | } |
| 762 | #endif |
| 763 | #endif |
| 764 | |
| 765 | /* |
| 766 | ** COMMAND: server |
| 767 | ** COMMAND: ui |
| 768 |
+1
-1
| --- src/winhttp.c | ||
| +++ src/winhttp.c | ||
| @@ -136,11 +136,11 @@ | ||
| 136 | 136 | ** Start a listening socket and process incoming HTTP requests on |
| 137 | 137 | ** that socket. |
| 138 | 138 | */ |
| 139 | 139 | void win32_http_server(int mnPort, int mxPort, char *zBrowser){ |
| 140 | 140 | WSADATA wd; |
| 141 | - SOCKET s; | |
| 141 | + SOCKET s = INVALID_SOCKET; | |
| 142 | 142 | SOCKADDR_IN addr; |
| 143 | 143 | int idCnt = 0; |
| 144 | 144 | int iPort = mnPort; |
| 145 | 145 | |
| 146 | 146 | if( WSAStartup(MAKEWORD(1,1), &wd) ){ |
| 147 | 147 |
| --- src/winhttp.c | |
| +++ src/winhttp.c | |
| @@ -136,11 +136,11 @@ | |
| 136 | ** Start a listening socket and process incoming HTTP requests on |
| 137 | ** that socket. |
| 138 | */ |
| 139 | void win32_http_server(int mnPort, int mxPort, char *zBrowser){ |
| 140 | WSADATA wd; |
| 141 | SOCKET s; |
| 142 | SOCKADDR_IN addr; |
| 143 | int idCnt = 0; |
| 144 | int iPort = mnPort; |
| 145 | |
| 146 | if( WSAStartup(MAKEWORD(1,1), &wd) ){ |
| 147 |
| --- src/winhttp.c | |
| +++ src/winhttp.c | |
| @@ -136,11 +136,11 @@ | |
| 136 | ** Start a listening socket and process incoming HTTP requests on |
| 137 | ** that socket. |
| 138 | */ |
| 139 | void win32_http_server(int mnPort, int mxPort, char *zBrowser){ |
| 140 | WSADATA wd; |
| 141 | SOCKET s = INVALID_SOCKET; |
| 142 | SOCKADDR_IN addr; |
| 143 | int idCnt = 0; |
| 144 | int iPort = mnPort; |
| 145 | |
| 146 | if( WSAStartup(MAKEWORD(1,1), &wd) ){ |
| 147 |