admin/libiscsi
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Fix compilation issues under clang

Browse Source 
clang defaults to c99 so remove inline statements
(http://clang.llvm.org/compatibility.html#inline ) on functions shared
across different translation units.
clang's linker doesn't like major numbers over 255 so change how SOREL
is generated in Makefile.am.
This commit is contained in:
Sitsofe Wheeler
2013-09-07 00:17:48 +01:00
parent 45a3752d16
commit 7692027d6c
5 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile.am
View File

@@ -43,9 +43,12 @@ lib_libiscsi_la_SOURCES += lib/md5.c
endif endif
SONAME=3 SONAME=3
SOREL=$(shell printf "%d%02d%02d" $(subst ., ,$(VERSION))) SOMAJOR = $(firstword $(version_split))
SOMINOR = $(word 2, $(version_split))
SOREVISION = $(word 3, $(version_split))
SOREL = $(shell echo $(SOMINOR) + $(SOREVISION))
lib_libiscsi_la_LDFLAGS = \ lib_libiscsi_la_LDFLAGS = \
-version-info $(SONAME):$(SOREL):0 -bindir $(bindir) -no-undefined \ -version-info $(SONAME):$(SOMAJOR):$(SOREL) -bindir $(bindir) -no-undefined \
-export-symbols $(srcdir)/lib/libiscsi.syms -export-symbols $(srcdir)/lib/libiscsi.syms
# libiscsi utilities # libiscsi utilities

14
include/iscsi-private.h
View File

@@ -305,13 +305,13 @@ void iscsi_set_error(struct iscsi_context *iscsi, const char *error_string,
struct scsi_iovector *iscsi_get_scsi_task_iovector_in(struct iscsi_context *iscsi, struct iscsi_in_pdu *in); struct scsi_iovector *iscsi_get_scsi_task_iovector_in(struct iscsi_context *iscsi, struct iscsi_in_pdu *in);
struct scsi_iovector *iscsi_get_scsi_task_iovector_out(struct iscsi_context *iscsi, struct iscsi_pdu *pdu); struct scsi_iovector *iscsi_get_scsi_task_iovector_out(struct iscsi_context *iscsi, struct iscsi_pdu *pdu);
inline void* iscsi_malloc(struct iscsi_context *iscsi, size_t size); void* iscsi_malloc(struct iscsi_context *iscsi, size_t size);
inline void* iscsi_zmalloc(struct iscsi_context *iscsi, size_t size); void* iscsi_zmalloc(struct iscsi_context *iscsi, size_t size);
inline void* iscsi_realloc(struct iscsi_context *iscsi, void* ptr, size_t size); void* iscsi_realloc(struct iscsi_context *iscsi, void* ptr, size_t size);
inline void iscsi_free(struct iscsi_context *iscsi, void* ptr); void iscsi_free(struct iscsi_context *iscsi, void* ptr);
inline char* iscsi_strdup(struct iscsi_context *iscsi, const char* str); char* iscsi_strdup(struct iscsi_context *iscsi, const char* str);
inline void* iscsi_szmalloc(struct iscsi_context *iscsi, size_t size); void* iscsi_szmalloc(struct iscsi_context *iscsi, size_t size);
inline void iscsi_sfree(struct iscsi_context *iscsi, void* ptr); void iscsi_sfree(struct iscsi_context *iscsi, void* ptr);
unsigned long crc32c(char *buf, int len); unsigned long crc32c(char *buf, int len);

8
include/scsi-lowlevel.h
View File

@@ -1074,10 +1074,10 @@ EXTERN struct scsi_task *scsi_cdb_writeverify16(uint64_t lba, uint32_t xferlen,
void *scsi_malloc(struct scsi_task *task, size_t size); void *scsi_malloc(struct scsi_task *task, size_t size);
inline uint32_t scsi_get_uint32(const unsigned char *c); uint32_t scsi_get_uint32(const unsigned char *c);
inline uint16_t scsi_get_uint16(const unsigned char *c); uint16_t scsi_get_uint16(const unsigned char *c);
inline void scsi_set_uint32(unsigned char *c, uint32_t val); void scsi_set_uint32(unsigned char *c, uint32_t val);
inline void scsi_set_uint16(unsigned char *c, uint16_t val); void scsi_set_uint16(unsigned char *c, uint16_t val);
#ifdef __cplusplus #ifdef __cplusplus
} }

14
lib/init.c
View File

@@ -33,13 +33,13 @@
#include "iscsi-private.h" #include "iscsi-private.h"
#include "slist.h" #include "slist.h"
inline void* iscsi_malloc(struct iscsi_context *iscsi, size_t size) { void* iscsi_malloc(struct iscsi_context *iscsi, size_t size) {
void * ptr = malloc(size); void * ptr = malloc(size);
if (ptr != NULL) iscsi->mallocs++; if (ptr != NULL) iscsi->mallocs++;
return ptr; return ptr;
} }
inline void* iscsi_zmalloc(struct iscsi_context *iscsi, size_t size) { void* iscsi_zmalloc(struct iscsi_context *iscsi, size_t size) {
void * ptr = malloc(size); void * ptr = malloc(size);
if (ptr != NULL) { if (ptr != NULL) {
memset(ptr,0x00,size); memset(ptr,0x00,size);
@@ -48,7 +48,7 @@ inline void* iscsi_zmalloc(struct iscsi_context *iscsi, size_t size) {
return ptr; return ptr;
} }
inline void* iscsi_realloc(struct iscsi_context *iscsi, void* ptr, size_t size) { void* iscsi_realloc(struct iscsi_context *iscsi, void* ptr, size_t size) {
void * _ptr = realloc(ptr, size); void * _ptr = realloc(ptr, size);
if (_ptr != NULL) { if (_ptr != NULL) {
iscsi->reallocs++; iscsi->reallocs++;
@@ -56,19 +56,19 @@ inline void* iscsi_realloc(struct iscsi_context *iscsi, void* ptr, size_t size)
return _ptr; return _ptr;
} }
inline void iscsi_free(struct iscsi_context *iscsi, void* ptr) { void iscsi_free(struct iscsi_context *iscsi, void* ptr) {
if (ptr == NULL) return; if (ptr == NULL) return;
free(ptr); free(ptr);
iscsi->frees++; iscsi->frees++;
} }
inline char* iscsi_strdup(struct iscsi_context *iscsi, const char* str) { char* iscsi_strdup(struct iscsi_context *iscsi, const char* str) {
char *str2 = strdup(str); char *str2 = strdup(str);
if (str2 != NULL) iscsi->mallocs++; if (str2 != NULL) iscsi->mallocs++;
return str2; return str2;
} }
inline void* iscsi_szmalloc(struct iscsi_context *iscsi, size_t size) { void* iscsi_szmalloc(struct iscsi_context *iscsi, size_t size) {
void *ptr; void *ptr;
if (size > iscsi->smalloc_size) return NULL; if (size > iscsi->smalloc_size) return NULL;
if (iscsi->smalloc_free > 0) { if (iscsi->smalloc_free > 0) {
@@ -81,7 +81,7 @@ inline void* iscsi_szmalloc(struct iscsi_context *iscsi, size_t size) {
return ptr; return ptr;
} }
inline void iscsi_sfree(struct iscsi_context *iscsi, void* ptr) { void iscsi_sfree(struct iscsi_context *iscsi, void* ptr) {
if (ptr == NULL) return; if (ptr == NULL) return;
if (iscsi->smalloc_free == SMALL_ALLOC_MAX_FREE) { if (iscsi->smalloc_free == SMALL_ALLOC_MAX_FREE) {
/* SMALL_ALLOC_MAX_FREE should be adjusted that this happens rarely */ /* SMALL_ALLOC_MAX_FREE should be adjusted that this happens rarely */

12
lib/scsi-lowlevel.c
View File

@@ -235,7 +235,7 @@ scsi_pr_type_str(enum scsi_persistent_out_type pr_type)
return value_string_find(pr_type_strings, pr_type); return value_string_find(pr_type_strings, pr_type);
} }
inline uint64_t uint64_t
scsi_get_uint64(const unsigned char *c) scsi_get_uint64(const unsigned char *c)
{ {
uint64_t val; uint64_t val;
@@ -248,7 +248,7 @@ scsi_get_uint64(const unsigned char *c)
return val; return val;
} }
inline uint32_t uint32_t
scsi_get_uint32(const unsigned char *c) scsi_get_uint32(const unsigned char *c)
{ {
uint32_t val; uint32_t val;
@@ -259,7 +259,7 @@ scsi_get_uint32(const unsigned char *c)
return val; return val;
} }
inline uint16_t uint16_t
scsi_get_uint16(const unsigned char *c) scsi_get_uint16(const unsigned char *c)
{ {
uint16_t val; uint16_t val;
@@ -314,7 +314,7 @@ task_get_uint8(struct scsi_task *task, int offset)
} }
} }
inline void void
scsi_set_uint64(unsigned char *c, uint64_t v) scsi_set_uint64(unsigned char *c, uint64_t v)
{ {
uint32_t val; uint32_t val;
@@ -327,7 +327,7 @@ scsi_set_uint64(unsigned char *c, uint64_t v)
scsi_set_uint32(c, val); scsi_set_uint32(c, val);
} }
inline void void
scsi_set_uint32(unsigned char *c, uint32_t val) scsi_set_uint32(unsigned char *c, uint32_t val)
{ {
c[0] = val >> 24; c[0] = val >> 24;
@@ -336,7 +336,7 @@ scsi_set_uint32(unsigned char *c, uint32_t val)
c[3] = val; c[3] = val;
} }
inline void void
scsi_set_uint16(unsigned char *c, uint16_t val) scsi_set_uint16(unsigned char *c, uint16_t val)
{ {
c[0] = val >> 8; c[0] = val >> 8;