3535. [bug] Minor win32 cleanups. [RT #32962]

diff --git a/CHANGES b/CHANGES
index bb648244ecdd339966645fbc267b3b8035473d40..386260f6d2f0b4b97dcae4555e7f61c2428f498f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+3535.  [bug]           Minor win32 cleanups. [RT #32962]
+
 3534.  [bug]           Extra text after an embedded NULL was ignored when
                        parsing zone files. [RT #32699]
 

diff --git a/lib/isc/win32/dir.c b/lib/isc/win32/dir.c
index 14fadde46af38275b72295f536be92245fac1298..d6a0bb3e44594dc62219ddd23963ea6577d895ac 100644 (file)
--- a/lib/isc/win32/dir.c
+++ b/lib/isc/win32/dir.c
@@ -267,7 +267,8 @@ isc_dir_createunique(char *templet) {
 
        do {
                i = mkdir(templet);
-               i = chmod(templet, 0700);
+               if (i == 0)
+                       i = chmod(templet, 0700);
 
                if (i == 0 || errno != EEXIST)
                        break;

diff --git a/lib/isc/win32/entropy.c b/lib/isc/win32/entropy.c
index 5a316e6e5cff04deaab30cd6a8387adc5109a75f..e329ab7e4a2bcd6357eb2c2d49a6c9ac35ef15f9 100644 (file)
--- a/lib/isc/win32/entropy.c
+++ b/lib/isc/win32/entropy.c
@@ -242,7 +242,6 @@ isc_entropy_createfilesource(isc_entropy_t *ent, const char *fname) {
        isc_result_t ret;
        isc_entropysource_t *source;
        HCRYPTPROV hcryptprov;
-       DWORD errval;
        BOOL err;
 
        REQUIRE(VALID_ENTROPY(ent));
@@ -258,7 +257,7 @@ isc_entropy_createfilesource(isc_entropy_t *ent, const char *fname) {
        err = CryptAcquireContext(&hcryptprov, NULL, NULL, PROV_RSA_FULL,
                                  CRYPT_VERIFYCONTEXT);
        if (!err){
-               errval = GetLastError();
+               (void)GetLastError();
                ret = ISC_R_IOERROR;
                goto errout;
        }

diff --git a/lib/isc/win32/file.c b/lib/isc/win32/file.c
index 337a8d024169a184ab224c3f5b063018e1ddd6f1..639ac8c8262ad96960e1e1dc43c50ad6edc01008 100644 (file)
--- a/lib/isc/win32/file.c
+++ b/lib/isc/win32/file.c
@@ -171,7 +171,7 @@ isc_file_safemovefile(const char *oldname, const char *newname) {
                tmpfd = mkstemp(buf, ISC_TRUE);
                if (tmpfd > 0)
                        _close(tmpfd);
-               DeleteFile(buf);
+               (void)DeleteFile(buf);
                _chmod(newname, _S_IREAD | _S_IWRITE);
 
                filestatus = MoveFile(newname, buf);
@@ -198,7 +198,7 @@ isc_file_safemovefile(const char *oldname, const char *newname) {
         * Delete the backup file if it got created
         */
        if (exists == TRUE)
-               filestatus = DeleteFile(buf);
+               (void)DeleteFile(buf);
        return (0);
 }
 
@@ -296,7 +296,7 @@ isc_file_template(const char *path, const char *templet, char *buf,
 
 isc_result_t
 isc_file_renameunique(const char *file, char *templet) {
-       int fd = -1;
+       int fd; 
        int res = 0;
        isc_result_t result = ISC_R_SUCCESS;
 

diff --git a/lib/isc/win32/fsaccess.c b/lib/isc/win32/fsaccess.c
index 8de793f0a8582e258268d1a2c8207975a1752f62..98205409363f797907bb23f777be6686fa133fd3 100644 (file)
--- a/lib/isc/win32/fsaccess.c
+++ b/lib/isc/win32/fsaccess.c
@@ -168,7 +168,6 @@ NTFS_Access_Control(const char *filename, const char *user, int access,
        char domainBuffer[100];
        DWORD domainBufferSize = sizeof(domainBuffer);
        SID_NAME_USE snu;
-       int errval;
        DWORD NTFSbits;
        int caccess;
 
@@ -184,13 +183,13 @@ NTFS_Access_Control(const char *filename, const char *user, int access,
        domainBufferSize = sizeof(domainBuffer);
        if (!LookupAccountName(0, "Administrators", padminsid,
                &adminSidBufferSize, domainBuffer, &domainBufferSize, &snu)) {
-               errval = GetLastError();
+               (void)GetLastError();
                return (ISC_R_NOPERM);
        }
        domainBufferSize = sizeof(domainBuffer);
        if (!LookupAccountName(0, "Everyone", pothersid,
                &otherSidBufferSize, domainBuffer, &domainBufferSize, &snu)) {
-               errval = GetLastError();
+               (void)GetLastError();
                return (ISC_R_NOPERM);
        }
 
@@ -287,7 +286,7 @@ NTFS_fsaccess_set(const char *path, isc_fsaccess_t access,
         * For NTFS we first need to get the name of the account under
         * which BIND is running
         */
-       if (namelen <= 0) {
+       if (namelen == 0) {
                namelen = sizeof(username);
                if (GetUserName(username, &namelen) == 0)
                        return (ISC_R_FAILURE);

diff --git a/lib/isc/win32/net.c b/lib/isc/win32/net.c
index 06d09819e662811acdd31193771b616d1ac7d3c3..a41641e62904edcdf92f5ec0743cf87cec3d87fd 100644 (file)
--- a/lib/isc/win32/net.c
+++ b/lib/isc/win32/net.c
@@ -64,7 +64,6 @@ void InitSockets(void);
 static isc_result_t
 try_proto(int domain) {
        SOCKET s;
-       isc_result_t result = ISC_R_SUCCESS;
        char strbuf[ISC_STRERRORSIZE];
        int errval;
 

diff --git a/lib/isc/win32/ntgroups.c b/lib/isc/win32/ntgroups.c
index 729cf07e74f0e026226374c9620ccd95f1632ba1..7f92a50bfcb365da4c9e0fc64a5e25dda7d73cf9 100644 (file)
--- a/lib/isc/win32/ntgroups.c
+++ b/lib/isc/win32/ntgroups.c
@@ -62,7 +62,6 @@ isc_ntsecurity_getaccountgroups(char *username, char **GroupList,
        DWORD dwEntriesRead = 0;
        DWORD dwTotalEntries = 0;
        NET_API_STATUS nStatus;
-       DWORD dwTotalCount = 0;
        size_t retlen;
        wchar_t user[MAX_NAME_LENGTH];
 
@@ -97,7 +96,6 @@ isc_ntsecurity_getaccountgroups(char *username, char **GroupList,
                        dwEntriesRead = 0;
        }
 
-       dwTotalCount = 0;
        if (pBuf != NULL) {
                pTmpLBuf = pBuf;
                /*

diff --git a/lib/isc/win32/os.c b/lib/isc/win32/os.c
index bbd5f1d6c190dfdab30563df3e2b4e4aa931cae5..6aea7809563bc5b2a71b4353625c17352b30264f 100644 (file)
--- a/lib/isc/win32/os.c
+++ b/lib/isc/win32/os.c
@@ -35,7 +35,7 @@ initialize_action(void) {
 
 unsigned int
 isc_os_ncpus(void) {
-       long ncpus = 1;
+       long ncpus;
        initialize_action();
        ncpus = SystemInfo.dwNumberOfProcessors;
        if (ncpus <= 0)

diff --git a/lib/isc/win32/socket.c b/lib/isc/win32/socket.c
index 2f8850612e153b571d0fa06f400b09d400547674..99b505f915ea888e179175f4db2726d4fe8678e8 100644 (file)
--- a/lib/isc/win32/socket.c
+++ b/lib/isc/win32/socket.c
@@ -713,7 +713,6 @@ static void
 queue_receive_request(isc_socket_t *sock) {
        DWORD Flags = 0;
        DWORD NumBytes = 0;
-       int total_bytes = 0;
        int Result;
        int Error;
        int need_retry;
@@ -1091,9 +1090,8 @@ dump_msg(struct msghdr *msg, isc_socket_t *sock) {
        printf("\tname %p, namelen %d\n", msg->msg_name, msg->msg_namelen);
        printf("\tiov %p, iovlen %d\n", msg->msg_iov, msg->msg_iovlen);
        for (i = 0; i < (unsigned int)msg->msg_iovlen; i++)
-               printf("\t\t%d\tbase %p, len %d\n", i,
-                      msg->msg_iov[i].buf,
-                      msg->msg_iov[i].len);
+               printf("\t\t%u\tbase %p, len %u\n", i,
+                      msg->msg_iov[i].buf, msg->msg_iov[i].len);
 }
 #endif
 
@@ -1603,21 +1601,21 @@ free_socket(isc_socket_t **sockp, int lineno) {
        isc_socket_t *sock = *sockp;
        *sockp = NULL;
 
-       manager = sock->manager;
-
        /*
         * Seems we can free the socket after all.
         */
        manager = sock->manager;
-       socket_log(__LINE__, sock, NULL, CREATION, isc_msgcat, ISC_MSGSET_SOCKET,
-                  ISC_MSG_DESTROYING, "freeing socket line %d fd %d lock %p semaphore %p",
+       socket_log(__LINE__, sock, NULL, CREATION, isc_msgcat,
+                  ISC_MSGSET_SOCKET, ISC_MSG_DESTROYING,
+                  "freeing socket line %d fd %d lock %p semaphore %p",
                   lineno, sock->fd, &sock->lock, sock->lock.LockSemaphore);
 
        sock->magic = 0;
        DESTROYLOCK(&sock->lock);
 
        if (sock->recvbuf.base != NULL)
-               isc_mem_put(manager->mctx, sock->recvbuf.base, sock->recvbuf.len);
+               isc_mem_put(manager->mctx, sock->recvbuf.base,
+                           sock->recvbuf.len);
 
        LOCK(&manager->lock);
        if (ISC_LINK_LINKED(sock, link))
@@ -1831,7 +1829,6 @@ isc__socket_attach(isc_socket_t *sock, isc_socket_t **socketp) {
 void
 isc__socket_detach(isc_socket_t **socketp) {
        isc_socket_t *sock;
-       isc_boolean_t kill_socket = ISC_FALSE;
 
        REQUIRE(socketp != NULL);
        sock = *socketp;
@@ -2730,10 +2727,7 @@ static isc_result_t
 socket_recv(isc_socket_t *sock, isc_socketevent_t *dev, isc_task_t *task,
            unsigned int flags)
 {
-       int cc = 0;
-       isc_task_t *ntask = NULL;
        isc_result_t result = ISC_R_SUCCESS;
-       int recv_errno = 0;
 
        dev->ev_sender = task;
 

diff --git a/lib/isc/win32/win32os.c b/lib/isc/win32/win32os.c
index 56498d0ade10ed4c64e432bc1afdac347b2b5385..1a1b593855272cea717c3e23d265b7f396608885 100644 (file)
--- a/lib/isc/win32/win32os.c
+++ b/lib/isc/win32/win32os.c
@@ -44,7 +44,7 @@ initialize_action(void) {
         */
        if(!bSuccess) {
                osVer.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-               bSuccess = GetVersionEx((OSVERSIONINFO *) &osVer);
+               (void)GetVersionEx((OSVERSIONINFO *) &osVer);
        }
        bInit = TRUE;
 }
@@ -98,4 +98,4 @@ isc_win32os_versioncheck(unsigned int major, unsigned int minor,
 
        /* Exact */
        return (0);
-}
\ No newline at end of file
+}

diff --git a/lib/lwres/win32/lwconfig.c b/lib/lwres/win32/lwconfig.c
index 79f9358811bcdb286ce770d3ca87fe93f6264e3e..4064de9d75fcbd9c0706b248d2d2734a7f396303 100644 (file)
--- a/lib/lwres/win32/lwconfig.c
+++ b/lib/lwres/win32/lwconfig.c
@@ -70,6 +70,10 @@ get_win32_searchlist(lwres_context_t *ctx) {
        }
 
        confdata->searchnxt = 0;
+
+       if (!keyFound)
+               return;
+
        cp = strtok((char *)searchlist, ", \0");
        while (cp != NULL) {
                if (confdata->searchnxt == LWRES_CONFMAXSEARCH)
@@ -85,8 +89,7 @@ get_win32_searchlist(lwres_context_t *ctx) {
 
 lwres_result_t
 lwres_conf_parse(lwres_context_t *ctx, const char *filename) {
-       lwres_result_t ret = LWRES_R_SUCCESS;
-       lwres_result_t res;
+       lwres_result_t ret;
        lwres_conf_t *confdata;
        FIXED_INFO * FixedInfo;
        ULONG    BufLen = sizeof(FIXED_INFO);
@@ -137,11 +140,11 @@ lwres_conf_parse(lwres_context_t *ctx, const char *filename) {
                if (confdata->nsnext >= LWRES_CONFMAXNAMESERVERS)
                        break;
 
-               res = lwres_create_addr(pIPAddr->IpAddress.String,
+               ret = lwres_create_addr(pIPAddr->IpAddress.String,
                                &confdata->nameservers[confdata->nsnext++], 1);
-               if (res != LWRES_R_SUCCESS) {
+               if (ret != LWRES_R_SUCCESS) {
                        GlobalFree(FixedInfo);
-                       return (res);
+                       return (ret);
                }
                pIPAddr = pIPAddr ->Next;
        }