aboutsummaryrefslogtreecommitdiff
path: root/libXext
diff options
context:
space:
mode:
Diffstat (limited to 'libXext')
-rw-r--r--libXext/include/X11/extensions/extutil.h2
-rw-r--r--libXext/include/X11/extensions/multibuf.h6
-rw-r--r--libXext/src/XSync.c2
-rw-r--r--libXext/src/Xdbe.c6
-rw-r--r--libXext/src/globals.c6
5 files changed, 2 insertions, 20 deletions
diff --git a/libXext/include/X11/extensions/extutil.h b/libXext/include/X11/extensions/extutil.h
index 29404d5ae..b22843068 100644
--- a/libXext/include/X11/extensions/extutil.h
+++ b/libXext/include/X11/extensions/extutil.h
@@ -178,7 +178,7 @@ char *proc (Display *dpy, int code, XExtCodes *codes, char *buf, int n) \
code -= codes->first_error; \
if (code >= 0 && code < nerr) { \
char tmp[256]; \
- sprintf (tmp, "%s.%d", extname, code); \
+ snprintf (tmp, sizeof(tmp), "%s.%d", extname, code); \
XGetErrorDatabaseText (dpy, "XProtoError", tmp, errl[code], buf, n); \
return buf; \
} \
diff --git a/libXext/include/X11/extensions/multibuf.h b/libXext/include/X11/extensions/multibuf.h
index 12fda357d..27165f08a 100644
--- a/libXext/include/X11/extensions/multibuf.h
+++ b/libXext/include/X11/extensions/multibuf.h
@@ -30,15 +30,9 @@ in this Software without prior written authorization from The Open Group.
#include <X11/extensions/multibufconst.h>
-#if !defined(UNIXCPP) || defined(ANSICPP)
#define MbufGetReq(name,req,info) GetReq (name, req); \
req->reqType = info->codes->major_opcode; \
req->mbufReqType = X_##name;
-#else
-#define MbufGetReq(name,req,info) GetReq (name, req); \
- req->reqType = info->codes->major_opcode; \
- req->mbufReqType = X_/**/name;
-#endif
/*
* Extra definitions that will only be needed in the client
diff --git a/libXext/src/XSync.c b/libXext/src/XSync.c
index ce4ab44d9..6e2af79a5 100644
--- a/libXext/src/XSync.c
+++ b/libXext/src/XSync.c
@@ -189,7 +189,7 @@ char *error_string(Display *dpy, int code, XExtCodes *codes, char *buf, int n)
code -= codes->first_error;
if (code >= 0 && code < nerr) {
char tmp[256];
- sprintf (tmp, "%s.%d", sync_extension_name, code);
+ snprintf (tmp, sizeof(tmp), "%s.%d", sync_extension_name, code);
XGetErrorDatabaseText (dpy, "XProtoError", tmp, sync_error_list[code], buf, n);
return buf;
}
diff --git a/libXext/src/Xdbe.c b/libXext/src/Xdbe.c
index 016886c58..7dd6c5ad2 100644
--- a/libXext/src/Xdbe.c
+++ b/libXext/src/Xdbe.c
@@ -51,15 +51,9 @@ static const char *dbe_extension_name = DBE_PROTOCOL_NAME;
#define DbeSimpleCheckExtension(dpy,i) \
XextSimpleCheckExtension (dpy, i, dbe_extension_name)
-#if !defined(UNIXCPP)
#define DbeGetReq(name,req,info) GetReq (name, req); \
req->reqType = info->codes->major_opcode; \
req->dbeReqType = X_##name;
-#else
-#define DbeGetReq(name,req,info) GetReq (name, req); \
- req->reqType = info->codes->major_opcode; \
- req->dbeReqType = X_/**/name;
-#endif
/*****************************************************************************
diff --git a/libXext/src/globals.c b/libXext/src/globals.c
index 8b5923de6..d5e7ad0c4 100644
--- a/libXext/src/globals.c
+++ b/libXext/src/globals.c
@@ -51,15 +51,9 @@ from The Open Group.
/*
* If we need to define extra variables for each global
*/
-#if !defined(UNIXCPP) || defined(ANSICPP)
#define ZEROINIT(t,var,val) SetZero(t,var,val); \
SetZero (long, _libX_##var##Flag, 0); \
SetZero (void *, _libX_##var##Ptr, NULL)
-#else /* else pcc concatenation */
-#define ZEROINIT(t,var,val) SetZero(t,var,val); \
- SetZero (long, _libX_/**/var/**/Flag, 0); \
- SetZero (void *, _libX_/**/var/**/Ptr, NULL)
-#endif /* concat ANSI C vs. pcc */
#else /* else not ATTSHAREDLIB */
/*