jep106.inc: Update to revision JEP106BC

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

diff --git a/src/helper/replacements.c b/src/helper/replacements.c
index f4ecb8dfcc5a719c48495e5ff1ad8ee8cfe30570..c34b17ec5a079b26205d86ae4a266ca26b4fd509 100644 (file)
--- a/src/helper/replacements.c
+++ b/src/helper/replacements.c
@@ -33,7 +33,7 @@
 void *clear_malloc(size_t size)
 {
        void *t = malloc(size);
-       if (t != NULL)
+       if (t)
                memset(t, 0x00, size);
        return t;
 }
@@ -41,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
@@ -124,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';
@@ -145,10 +145,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;
@@ -233,16 +233,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++;
                                                                }
@@ -275,45 +275,3 @@ int win_select(int max_fd, fd_set *rfds, fd_set *wfds, fd_set *efds, struct time
        return retcode;
 }
 #endif
-
-#if defined HAVE_LIBUSB1 && !defined HAVE_LIBUSB_ERROR_NAME
-#include <libusb.h>
-/* Verbatim from git://git.libusb.org/libusb.git tag 1.0.9
- * The libusb_error enum is compatible down to v0.9.1
- */
-const char *libusb_error_name(int error_code)
-{
-       enum libusb_error error = error_code;
-       switch (error) {
-       case LIBUSB_SUCCESS:
-               return "LIBUSB_SUCCESS";
-       case LIBUSB_ERROR_IO:
-               return "LIBUSB_ERROR_IO";
-       case LIBUSB_ERROR_INVALID_PARAM:
-               return "LIBUSB_ERROR_INVALID_PARAM";
-       case LIBUSB_ERROR_ACCESS:
-               return "LIBUSB_ERROR_ACCESS";
-       case LIBUSB_ERROR_NO_DEVICE:
-               return "LIBUSB_ERROR_NO_DEVICE";
-       case LIBUSB_ERROR_NOT_FOUND:
-               return "LIBUSB_ERROR_NOT_FOUND";
-       case LIBUSB_ERROR_BUSY:
-               return "LIBUSB_ERROR_BUSY";
-       case LIBUSB_ERROR_TIMEOUT:
-               return "LIBUSB_ERROR_TIMEOUT";
-       case LIBUSB_ERROR_OVERFLOW:
-               return "LIBUSB_ERROR_OVERFLOW";
-       case LIBUSB_ERROR_PIPE:
-               return "LIBUSB_ERROR_PIPE";
-       case LIBUSB_ERROR_INTERRUPTED:
-               return "LIBUSB_ERROR_INTERRUPTED";
-       case LIBUSB_ERROR_NO_MEM:
-               return "LIBUSB_ERROR_NO_MEM";
-       case LIBUSB_ERROR_NOT_SUPPORTED:
-               return "LIBUSB_ERROR_NOT_SUPPORTED";
-       case LIBUSB_ERROR_OTHER:
-               return "LIBUSB_ERROR_OTHER";
-       }
-       return "**UNKNOWN**";
-}
-#endif