diff options
| author | Douglas Gilbert <dgilbert@interlog.com> | 2013-11-26 01:14:16 +0000 |
|---|---|---|
| committer | Douglas Gilbert <dgilbert@interlog.com> | 2013-11-26 01:14:16 +0000 |
| commit | 6fd53a9c043f14b4fe0ec87fbc8371cbecfd429d (patch) | |
| tree | 93485ef1deb1952b3491678646e5dd7a774e444f /src/sg_raw.c | |
| parent | 87f287cceb05f5f41ba1ceee1c0fb9f7e5d561be (diff) | |
| download | sg3_utils-6fd53a9c043f14b4fe0ec87fbc8371cbecfd429d.tar.gz | |
sg_ses: error and warning message cleanup; sg_raw: fix compiler warning
git-svn-id: https://svn.bingwo.ca/repos/sg3_utils/trunk@534 6180dd3e-e324-4e3e-922d-17de1ae2f315
Diffstat (limited to 'src/sg_raw.c')
| -rw-r--r-- | src/sg_raw.c | 38 |
1 files changed, 21 insertions, 17 deletions
diff --git a/src/sg_raw.c b/src/sg_raw.c index 174a158b..ce6ed7f3 100644 --- a/src/sg_raw.c +++ b/src/sg_raw.c @@ -25,7 +25,7 @@ #include "sg_lib.h" #include "sg_pt.h" -#define SG_RAW_VERSION "0.4.6 (2013-10-13)" +#define SG_RAW_VERSION "0.4.7 (2013-11-24)" #ifdef SG_LIB_WIN32 #ifndef HAVE_SYSCONF @@ -248,7 +248,6 @@ process_cl(struct opts_t *optsp, int argc, char *argv[]) static unsigned char * my_memalign(int length, unsigned char ** wrkBuffp) { - unsigned char * wrkBuff; size_t psz; #if defined(HAVE_SYSCONF) && defined(_SC_PAGESIZE) @@ -262,28 +261,33 @@ my_memalign(int length, unsigned char ** wrkBuffp) #ifdef HAVE_POSIX_MEMALIGN { int err; + void * wp = NULL; - err = posix_memalign((void **)&wrkBuff, psz, length); - if (err) { - fprintf(stderr, "posix_memalign: error [%d] out of memory?\n", + err = posix_memalign(&wp, psz, length); + if (err || (NULL == wp)) { + fprintf(stderr, "posix_memalign: error [%d], out of memory?\n", err); return NULL; } - memset(wrkBuff, 0, length); + memset(wp, 0, length); if (wrkBuffp) - *wrkBuffp = wrkBuff; - return wrkBuff; + *wrkBuffp = (unsigned char *)wp; + return (unsigned char *)wp; } #else - wrkBuff = (unsigned char*)calloc(length + psz, 1); - if (NULL == wrkBuff) { - if (wrkBuffp) - *wrkBuffp = NULL; - return NULL; - } else if (wrkBuffp) - *wrkBuffp = wrkBuff; - return (unsigned char *)(((unsigned long)wrkBuff + psz - 1) & - (~(psz - 1))); + { + unsigned char * wrkBuff; + + wrkBuff = (unsigned char*)calloc(length + psz, 1); + if (NULL == wrkBuff) { + if (wrkBuffp) + *wrkBuffp = NULL; + return NULL; + } else if (wrkBuffp) + *wrkBuffp = wrkBuff; + return (unsigned char *)(((unsigned long)wrkBuff + psz - 1) & + (~(psz - 1))); + } #endif } |