Fix a bunch of -Wcast-qual warnings in cd9660_util.c, by using
__DECONST. No functional change. MFC after: 3 days
This commit is contained in:
parent
09bb4a314a
commit
03ce3d7219
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=277899
@ -80,7 +80,8 @@ isochar(isofn, isoend, joliet_level, c, clen, flags, handle)
|
|||||||
inbuf[2]='\0';
|
inbuf[2]='\0';
|
||||||
inp = inbuf;
|
inp = inbuf;
|
||||||
outp = outbuf;
|
outp = outbuf;
|
||||||
cd9660_iconv->convchr(handle, (const char **)&inp, &i, &outp, &j);
|
cd9660_iconv->convchr(handle, __DECONST(const char **, &inp), &i,
|
||||||
|
&outp, &j);
|
||||||
len -= j;
|
len -= j;
|
||||||
if (clen) *clen = len;
|
if (clen) *clen = len;
|
||||||
*c = '\0';
|
*c = '\0';
|
||||||
@ -121,7 +122,8 @@ isofncmp(fn, fnlen, isofn, isolen, joliet_level, flags, handle, lhandle)
|
|||||||
u_char *fnend = fn + fnlen, *isoend = isofn + isolen;
|
u_char *fnend = fn + fnlen, *isoend = isofn + isolen;
|
||||||
|
|
||||||
for (; fn < fnend; ) {
|
for (; fn < fnend; ) {
|
||||||
d = sgetrune(fn, fnend - fn, (char const **)&fn, flags, lhandle);
|
d = sgetrune(fn, fnend - fn, __DECONST(const char **, &fn),
|
||||||
|
flags, lhandle);
|
||||||
if (isofn == isoend)
|
if (isofn == isoend)
|
||||||
return d;
|
return d;
|
||||||
isofn += isochar(isofn, isoend, joliet_level, &c, NULL, flags, handle);
|
isofn += isochar(isofn, isoend, joliet_level, &c, NULL, flags, handle);
|
||||||
|
Loading…
Reference in New Issue
Block a user