projects
/
fw
/
openocd
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 2ae87e553355901d6e6ac8d461f96bcb32885a62..c34b17ec5a079b26205d86ae4a266ca26b4fd509 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 *
* 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!!!! */
***************************************************************************/
/* 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);
void *clear_malloc(size_t size)
{
void *t = malloc(size);
- if (t
!= NULL
)
+ if (t)
memset(t, 0x00, size);
return 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);
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
/* 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>
#ifdef _WIN32
#include <io.h>
+#include <winsock2.h>
#endif
/* replacements for gettimeofday */
#endif
/* replacements for gettimeofday */
@@
-123,9
+122,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 *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';
return NULL;
new[len] = '\0';
@@
-146,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;
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 */
/* calculate how long we need to wait in milliseconds */
- if (
tv == NULL
)
+ if (
!tv
)
ms_total = INFINITE;
else {
ms_total = tv->tv_sec * 1000;
ms_total = INFINITE;
else {
ms_total = tv->tv_sec * 1000;
@@
-234,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 (retcode < 0)
retcode = 0;
for (i = 0; i < n_handles; i++) {
- if (W
AIT_OBJECT_0 == WaitForSingleObject(handles[i], 0)
) {
+ if (W
aitForSingleObject(handles[i], 0) == WAIT_OBJECT_0
) {
if (SAFE_FD_ISSET(handle_slot_to_fd[i], rfds)) {
if (SAFE_FD_ISSET(handle_slot_to_fd[i], rfds)) {
- DWORD
dwB
ytes;
+ DWORD
b
ytes;
intptr_t handle = (intptr_t) _get_osfhandle(
handle_slot_to_fd[i]);
if (PeekNamedPipe((HANDLE)handle, NULL, 0,
intptr_t handle = (intptr_t) _get_osfhandle(
handle_slot_to_fd[i]);
if (PeekNamedPipe((HANDLE)handle, NULL, 0,
- NULL, &
dwB
ytes, NULL)) {
+ NULL, &
b
ytes, NULL)) {
/* check to see if gdb pipe has data available */
/* check to see if gdb pipe has data available */
- if (
dwB
ytes) {
+ if (
b
ytes) {
FD_SET(handle_slot_to_fd[i], &aread);
retcode++;
}
FD_SET(handle_slot_to_fd[i], &aread);
retcode++;
}