38 lines
1.6 KiB
Plaintext
38 lines
1.6 KiB
Plaintext
$OpenBSD: patch-util_c,v 1.1 2017/05/06 10:19:04 naddy Exp $
|
|
|
|
Index: util.c
|
|
--- util.c.orig
|
|
+++ util.c
|
|
@@ -53,6 +53,13 @@ static char RCSinfo[]=
|
|
#include <X11/Xmu/CharSet.h>
|
|
#include <X11/xpm.h>
|
|
|
|
+extern Pixmap XcprLocatePixmapFile (Screen *screen, _Xconst char *name,
|
|
+ unsigned long fore, unsigned long back,
|
|
+ unsigned int depth,
|
|
+ char *srcname, int srcnamelen,
|
|
+ int *widthp, int *heightp, int *xhotp, int *yhotp,
|
|
+ Bool *isXpm, XpmAttributes *attribs, Pixmap *mask);
|
|
+
|
|
static Pixmap CreateXLogoPixmap (unsigned int *widthp, unsigned int *heightp);
|
|
static Pixmap CreateResizePixmap (unsigned int *widthp, unsigned int *heightp);
|
|
static Pixmap CreateQuestionPixmap(unsigned int *widthp, unsigned int *heightp);
|
|
@@ -272,7 +279,7 @@ ExpandFilename(char *name)
|
|
newname = (char *) malloc (HomeLen + strlen(name) + 2);
|
|
if (!newname) {
|
|
fprintf (stderr,
|
|
- "%s: unable to allocate %d bytes to expand filename %s/%s\n",
|
|
+ "%s: unable to allocate %zu bytes to expand filename %s/%s\n",
|
|
ProgramName, HomeLen + strlen(name) + 2, Home, &name[1]);
|
|
} else {
|
|
(void) sprintf (newname, "%s/%s", Home, &name[1]);
|
|
@@ -517,7 +524,7 @@ InsertRGBColormap(Atom a,XStandardColormap *maps, int
|
|
if (!sc) { /* no existing, allocate new */
|
|
sc = (StdCmap *) malloc (sizeof (StdCmap));
|
|
if (!sc) {
|
|
- fprintf (stderr, "%s: unable to allocate %d bytes for StdCmap\n",
|
|
+ fprintf (stderr, "%s: unable to allocate %zu bytes for StdCmap\n",
|
|
ProgramName, sizeof (StdCmap));
|
|
return;
|
|
}
|