X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fhelper%2Freplacements.c;h=782d975184eaaab956e989345f1376f1f48b1edb;hb=247d8df3146f2e80487962fe5103cd28f170d288;hp=0ba98a488e6ea43bb4fcabed1cdc8101ec8a9112;hpb=95025349faabec99d6c6758351a5543caaa54c18;p=openocd.git

diff --git a/src/helper/replacements.c b/src/helper/replacements.c
index 0ba98a488e..782d975184 100644
--- a/src/helper/replacements.c
+++ b/src/helper/replacements.c
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 /***************************************************************************
  *   Copyright (C) 2006 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
@@ -7,26 +9,19 @@
  *                                                                         *
  *   Copyright (C) 2008 by Spencer Oliver                                  *
  *   spen@spen-soft.co.uk                                                  *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   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.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
-/* DANGER!!!! These must be defined *BEFORE* replacements.h and the malloc() macro!!!! */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+/* define IN_REPLACEMENTS_C before include replacements.h */
+#define IN_REPLACEMENTS_C
+#include "replacements.h"
 
 #include <stdlib.h>
 #include <string.h>
+
 /*
  * clear_malloc
  *
@@ -35,7 +30,7 @@
 void *clear_malloc(size_t size)
 {
 	void *t = malloc(size);
-	if (t != NULL)
+	if (t)
 		memset(t, 0x00, size);
 	return t;
 }
@@ -43,7 +38,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
@@ -54,16 +49,13 @@ void *fill_malloc(size_t size)
 	return t;
 }
 
-#define IN_REPLACEMENTS_C
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
 #ifdef HAVE_STRINGS_H
 #include <strings.h>
 #endif
 
 #ifdef _WIN32
 #include <io.h>
+#include <winsock2.h>
 #endif
 
 /* replacements for gettimeofday */
@@ -123,9 +115,9 @@ size_t strnlen(const char *s, size_t maxlen)
 char *strndup(const char *s, size_t n)
 {
 	size_t len = strnlen(s, n);
-	char *new = (char *) malloc(len + 1);
+	char *new = malloc(len + 1);
 
-	if (new == NULL)
+	if (!new)
 		return NULL;
 
 	new[len] = '\0';
@@ -146,10 +138,10 @@ int win_select(int max_fd, fd_set *rfds, fd_set *wfds, fd_set *efds, struct time
 	struct timeval tvslice;
 	int retcode;
 
-#define SAFE_FD_ISSET(fd, set)  (set != NULL && FD_ISSET(fd, set))
+#define SAFE_FD_ISSET(fd, set)  (set && 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;
@@ -234,16 +226,16 @@ int win_select(int max_fd, fd_set *rfds, fd_set *wfds, fd_set *efds, struct time
 				if (retcode < 0)
 					retcode = 0;
 				for (i = 0; i < n_handles; i++) {
-					if (WAIT_OBJECT_0 == WaitForSingleObject(handles[i], 0)) {
+					if (WaitForSingleObject(handles[i], 0) == WAIT_OBJECT_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++;
 								}