Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More portability fixes, mainly for Solaris 9.

Browse Source
This commit is contained in:
agc 2006-03-28 20:03:30 +00:00
parent e3482ab49e
commit 2171876d1d
6 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/iscsi/include/compat.h vendored
View File

@ -40,7 +40,7 @@ size_t strlcpy(char *, const char *, size_t);
#ifndef HTOBE64
# if _BYTE_ORDER == _BIG_ENDIAN
# define HTOBE64(x) (void) (x)
# define HTOBE64(x) (x)
# else /* LITTLE_ENDIAN */
# define HTOBE64(x) (x) = __bswap64((u_int64_t)(x))
# define bswap64(x) __bswap64(x)

6
dist/iscsi/include/osd.h vendored
View File

@ -33,7 +33,11 @@
#ifndef OSD_H
#define OSD_H
#ifndef __KERNEL__
#include "config.h"
#include <sys/types.h>
#ifdef HAVE_STDINT_H
#include <stdint.h>
#endif

2
dist/iscsi/include/util.h vendored
View File

@ -417,7 +417,7 @@ typedef struct {
} iscsi_worker_t;
#define ISCSI_WORKER_EXIT(ME) do { \
TRACE(TRACE_ISCSI_DEBUG ,"exiting\n"); \
iscsi_trace(TRACE_ISCSI_DEBUG ,"exiting\n"); \
(ME)->state |= ISCSI_WORKER_STATE_EXITING; \
return 0; \
} while (/* CONSTCOND */ 0)

4
dist/iscsi/src/Makefile.in vendored
View File

@ -62,9 +62,9 @@ osd: osd-target.c osd.c $(USER_TARGET_OBJS)
#
$(BIN)/iscsi-harness: iscsi-harness.o tests.o iscsi.o util.o initiator.o parameters.o osd_ops.o conffile.o
$(CC) iscsi-harness.o tests.o iscsi.o util.o initiator.o parameters.o osd_ops.o conffile.o -o $(BIN)/iscsi-harness ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
$(CC) iscsi-harness.o tests.o iscsi.o util.o initiator.o parameters.o osd_ops.o conffile.o -o $(BIN)/iscsi-harness ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} ${LIBS}
iscsi-harness: iscsi-harness.o tests.o iscsi.o util.o initiator.o parameters.o osd_ops.o conffile.o
$(CC) iscsi-harness.o tests.o iscsi.o util.o initiator.o parameters.o osd_ops.o conffile.o -o iscsi-harness ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
$(CC) iscsi-harness.o tests.o iscsi.o util.o initiator.o parameters.o osd_ops.o conffile.o -o iscsi-harness ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} ${LIBS}
#
# Dependencies

2
dist/iscsi/src/target.c vendored
View File

@ -1585,7 +1585,7 @@ target_listen(globals_t *gp)
/* Accept connection, spawn session thread, and */
/* clean up old threads */
iscsi_trace(TRACE_NET_DEBUG, "waiting for IPv4 connection on port %d\n", gp->port);
iscsi_trace(TRACE_NET_DEBUG, "waiting for IPv4 connection on port %d\n", ISCSI_HTONS(gp->port));
if (iscsi_sock_accept(gp->sock, &sess->sock) < 0) {
iscsi_trace(TRACE_ISCSI_DEBUG, "iscsi_sock_accept() failed\n");
goto done;

12
dist/iscsi/src/util.c vendored
View File

@ -246,8 +246,8 @@ iscsi_trace(const int trace, const char *fmt, ...)
if (iscsi_debug_level & trace) {
va_start(vp, fmt);
(void) snprintf(buf, sizeof(buf), fmt, vp);
printf("pid %i:%s:%d: %s",
ISCSI_GETPID, __FILE__, __LINE__,
printf("pid %d:%s:%d: %s",
(int) ISCSI_GETPID, __FILE__, __LINE__,
buf);
va_end(vp);
}
@ -264,8 +264,8 @@ iscsi_trace_warning(const char *fmt, ...)
if (iscsi_debug_level & TRACE_WARN) {
va_start(vp, fmt);
(void) snprintf(buf, sizeof(buf), fmt, vp);
printf("pid %i:%s:%d: ***WARNING*** %s",
ISCSI_GETPID, __FILE__, __LINE__,
printf("pid %d:%s:%d: ***WARNING*** %s",
(int) ISCSI_GETPID, __FILE__, __LINE__,
buf);
va_end(vp);
}
@ -282,8 +282,8 @@ iscsi_trace_error(const char *fmt, ...)
va_start(vp, fmt);
(void) snprintf(buf, sizeof(buf), fmt, vp);
va_end(vp);
printf("pid %i:%s:%d: ***ERROR*** %s",
ISCSI_GETPID, __FILE__, __LINE__,
printf("pid %d:%s:%d: ***ERROR*** %s",
(int) ISCSI_GETPID, __FILE__, __LINE__,
buf);
# ifdef HAVE_SYSLOG
syslog(LOG_ERR, "pid %d:%s:%d: ***ERROR*** %s",