Module Name: xsrc
Committed By: riz
Date: Tue Dec 10 23:08:36 UTC 2013
Modified Files:
xsrc/external/mit/fontconfig/dist/src: fcformat.c
xsrc/external/mit/libXvMC/dist/src: XvMC.c
Log Message:
Repeat after me: '\0' is *not* a pointer. Use NULL instead.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 xsrc/external/mit/fontconfig/dist/src/fcformat.c
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libXvMC/dist/src/XvMC.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/fontconfig/dist/src/fcformat.c
diff -u xsrc/external/mit/fontconfig/dist/src/fcformat.c:1.1.1.3 xsrc/external/mit/fontconfig/dist/src/fcformat.c:1.2
--- xsrc/external/mit/fontconfig/dist/src/fcformat.c:1.1.1.3 Mon Jun 3 19:44:51 2013
+++ xsrc/external/mit/fontconfig/dist/src/fcformat.c Tue Dec 10 23:08:36 2013
@@ -769,14 +769,14 @@ interpret_simple (FcFormatContext *c,
}
if (l && idx == 0)
{
- if (!FcNameUnparseValue (buf, &l->value, '\0'))
+ if (!FcNameUnparseValue (buf, &l->value, NULL))
return FcFalse;
}
else goto notfound;
}
else if (l)
{
- FcNameUnparseValueList (buf, l, '\0');
+ FcNameUnparseValueList (buf, l, NULL);
}
else
{
Index: xsrc/external/mit/libXvMC/dist/src/XvMC.c
diff -u xsrc/external/mit/libXvMC/dist/src/XvMC.c:1.2 xsrc/external/mit/libXvMC/dist/src/XvMC.c:1.3
--- xsrc/external/mit/libXvMC/dist/src/XvMC.c:1.2 Thu Jun 6 06:46:33 2013
+++ xsrc/external/mit/libXvMC/dist/src/XvMC.c Tue Dec 10 23:08:36 2013
@@ -571,9 +571,9 @@ Status XvMCGetDRInfo(Display *dpy, XvPor
if (*name && *busID && tmpBuf) {
_XRead(dpy, tmpBuf, realSize);
strncpy(*name,tmpBuf,rep.nameLen);
- name[rep.nameLen - 1] = '\0';
+ name[rep.nameLen - 1] = NULL;
strncpy(*busID,tmpBuf+rep.nameLen,rep.busIDLen);
- busID[rep.busIDLen - 1] = '\0';
+ busID[rep.busIDLen - 1] = NULL;
XFree(tmpBuf);
} else {
XFree(*name);