openocd: fix simple cases of NULL comparison

[openocd.git] / src / helper / replacements.c

diff --git a/src/helper/replacements.c b/src/helper/replacements.c
index bb23dd92b71f9c77b9687dd4652a1f45a5b18fb8..68032b7fd5654a4ed47ea6360b05a6d35f60ff06 100644 (file)
--- a/src/helper/replacements.c
+++ b/src/helper/replacements.c
@@ -19,9 +19,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 /* DANGER!!!! These must be defined *BEFORE* replacements.h and the malloc() macro!!!! */
 
@@ -35,7 +33,7 @@
 void *clear_malloc(size_t size)
 {
        void *t = malloc(size);
-       if (t != NULL)
+       if (t)
                memset(t, 0x00, size);
        return t;
 }
@@ -43,7 +41,7 @@ void *clear_malloc(size_t size)
 void *fill_malloc(size_t size)
 {
        void *t = malloc(size);
-       if (t != NULL) {
+       if (t) {
                /* We want to initialize memory to some known bad state.
                 * 0 and 0xff yields 0 and -1 as integers, which often
                 * have meaningful values. 0x5555... is not often a valid
@@ -64,6 +62,7 @@ void *fill_malloc(size_t size)
 
 #ifdef _WIN32
 #include <io.h>
+#include <winsock2.h>
 #endif
 
 /* replacements for gettimeofday */
@@ -125,7 +124,7 @@ char *strndup(const char *s, size_t n)
        size_t len = strnlen(s, n);
        char *new = malloc(len + 1);
 
-       if (new == NULL)
+       if (!new)
                return NULL;
 
        new[len] = '\0';
@@ -149,7 +148,7 @@ int win_select(int max_fd, fd_set *rfds, fd_set *wfds, fd_set *efds, struct time
 #define SAFE_FD_ISSET(fd, set)  (set != NULL && FD_ISSET(fd, set))
 
        /* calculate how long we need to wait in milliseconds */
-       if (tv == NULL)
+       if (!tv)
                ms_total = INFINITE;
        else {
                ms_total = tv->tv_sec * 1000;
@@ -236,14 +235,14 @@ int win_select(int max_fd, fd_set *rfds, fd_set *wfds, fd_set *efds, struct time
                                for (i = 0; i < n_handles; i++) {
                                        if (WAIT_OBJECT_0 == WaitForSingleObject(handles[i], 0)) {
                                                if (SAFE_FD_ISSET(handle_slot_to_fd[i], rfds)) {
-                                                       DWORD dwBytes;
+                                                       DWORD bytes;
                                                        intptr_t handle = (intptr_t) _get_osfhandle(
                                                                        handle_slot_to_fd[i]);
 
                                                        if (PeekNamedPipe((HANDLE)handle, NULL, 0,
-                                                                   NULL, &dwBytes, NULL)) {
+                                                                   NULL, &bytes, NULL)) {
                                                                /* check to see if gdb pipe has data available */
-                                                               if (dwBytes) {
+                                                               if (bytes) {
                                                                        FD_SET(handle_slot_to_fd[i], &aread);
                                                                        retcode++;
                                                                }