Skip to content

Commit da5f825

Browse files
author
Cristy
committed
eliminate compiler warnings
1 parent 366c9cb commit da5f825

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

MagickCache/magick-cache.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ MagickExport MagickCache *AcquireMagickCache(const char *path,
290290
cache=DestroyMagickCache(cache);
291291
return((MagickCache *) NULL);
292292
}
293-
GetMagickCacheSentinel(cache,sentinel);
293+
GetMagickCacheSentinel(cache,(unsigned char *) sentinel);
294294
signature=GetMagickCacheSignature(cache->nonce);
295295
if (memcmp(&signature,sentinel,sizeof(signature)) != 0)
296296
{
@@ -958,7 +958,7 @@ MagickExport MagickBooleanType GetMagickCacheResource(MagickCache *cache,
958958
path=DestroyString(path);
959959
if (sentinel == NULL)
960960
return(MagickFalse);
961-
GetMagickCacheResourceSentinel(resource,sentinel);
961+
GetMagickCacheResourceSentinel(resource,(unsigned char *) sentinel);
962962
signature=GetMagickCacheSignature(resource->nonce);
963963
/*
964964
If no cache passkey, generate the resource ID.
@@ -1129,8 +1129,8 @@ static MagickBooleanType ResourceToBlob(MagickCacheResource *resource,
11291129
ssize_t
11301130
count;
11311131

1132-
count=read(file,resource->blob+i,(size_t) MagickCacheMin(resource->extent-i,
1133-
(size_t) SSIZE_MAX));
1132+
count=read(file,(unsigned char *) resource->blob+i,(size_t)
1133+
MagickCacheMin(resource->extent-i,(size_t) SSIZE_MAX));
11341134
if (count <= 0)
11351135
{
11361136
count=0;
@@ -1877,7 +1877,7 @@ MagickExport MagickBooleanType IterateMagickCacheResources(MagickCache *cache,
18771877
assert(cache != (MagickCache *) NULL);
18781878
assert(cache->signature == MagickCacheSignature);
18791879
status=MagickTrue;
1880-
head=AcquireCriticalMemory(sizeof(struct ResourceNode));
1880+
head=(ResourceNode *) AcquireCriticalMemory(sizeof(*node));
18811881
head->path=AcquireString(cache->path);
18821882
(void) ConcatenateString(&head->path,"/");
18831883
(void) ConcatenateString(&head->path,iri);
@@ -1906,7 +1906,7 @@ MagickExport MagickBooleanType IterateMagickCacheResources(MagickCache *cache,
19061906
}
19071907
if (S_ISDIR(attributes.st_mode) != 0)
19081908
{
1909-
node=AcquireCriticalMemory(sizeof(struct ResourceNode));
1909+
node=(ResourceNode *) AcquireCriticalMemory(sizeof(*node));
19101910
node->path=path;
19111911
node->next=(struct ResourceNode *) NULL;
19121912
node->previous=q;

Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -208,10 +208,10 @@ AUTOCONF = ${SHELL} /home/cristy/MagickCache-0.9.2/missing autoconf
208208
AUTOHEADER = ${SHELL} /home/cristy/MagickCache-0.9.2/missing autoheader
209209
AUTOMAKE = ${SHELL} /home/cristy/MagickCache-0.9.2/missing automake-1.16
210210
AWK = gawk
211-
CC = /usr/bin/afl-clang-fast
211+
CC = c++
212212
CCDEPMODE = depmode=gcc3
213-
CFLAGS = -ggdb -fsanitize=memory,undefined -fno-omit-frame-pointer
214-
CPP = /usr/bin/afl-clang-fast -E
213+
CFLAGS =
214+
CPP = c++ -E
215215
CPPFLAGS =
216216
CYGPATH_W = echo
217217
DEFS = -DHAVE_CONFIG_H
@@ -227,7 +227,7 @@ INSTALL_DATA = ${INSTALL} -m 644
227227
INSTALL_PROGRAM = ${INSTALL}
228228
INSTALL_SCRIPT = ${INSTALL}
229229
INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
230-
LDFLAGS = -ggdb -fsanitize=memory,undefined -fno-omit-frame-pointer
230+
LDFLAGS =
231231
LIBOBJS =
232232
LIBS =
233233
LTLIBOBJS =
@@ -277,7 +277,7 @@ abs_builddir = /home/cristy/MagickCache-0.9.2
277277
abs_srcdir = /home/cristy/MagickCache-0.9.2
278278
abs_top_builddir = /home/cristy/MagickCache-0.9.2
279279
abs_top_srcdir = /home/cristy/MagickCache-0.9.2
280-
ac_ct_CC = /usr/bin/afl-clang-fast
280+
ac_ct_CC = c++
281281
am__include = include
282282
am__leading_dot = .
283283
am__quote =

utilities/magick-cache.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ static MagickBooleanType MagickCacheCLI(int argc,char **argv,
143143
cache=DestroyMagickCache(cache); \
144144
if (message != (char *) NULL) \
145145
message=DestroyString(message); \
146-
return(-1); \
146+
return(MagickFalse); \
147147
}
148148
#define ThrowMagickCacheException(cache) \
149149
{ \
@@ -295,7 +295,7 @@ static MagickBooleanType MagickCacheCLI(int argc,char **argv,
295295
"unable to create magick cache","`%s': %s",path,message);
296296
MagickCacheExit(exception);
297297
}
298-
return(0);
298+
return(MagickTrue);
299299
}
300300
cache=AcquireMagickCache(path,passkey);
301301
if (cache == (MagickCache *) NULL)
@@ -539,7 +539,7 @@ static MagickBooleanType MagickCacheCLI(int argc,char **argv,
539539
passkey=DestroyStringInfo(passkey);
540540
resource=DestroyMagickCacheResource(resource);
541541
cache=DestroyMagickCache(cache);
542-
return(0);
542+
return(MagickTrue);
543543
}
544544

545545
static int MagickCacheMain(int argc,char **argv)

0 commit comments

Comments
 (0)