utils: Format the protocol verison number proper to avoid confusion

Part-of: <https://gitlab.freedesktop.org/xorg/app/editres/-/merge_requests/7>

4 files changed, 9 insertions, 18 deletions

diff --git a/app-defaults/Editres b/app-defaults/Editres
index e9ddd90..14eecae 100644
--- a/app-defaults/Editres
+++ b/app-defaults/Editres
@@ -89,7 +89,7 @@ Editres.Geometry:			500x568
 *label33: Internal Error: Unknown activate type.
 *label34: Only one Resource Box can be active at a time.
 *label35: Unable to unpack protocol request.
-*label36: This version of editres uses protocol version %s,\nbut the client speaks version %s.
+*label36: This version of editres uses protocol version %d,\nbut the client speaks version %d.
 
 ! Xt Messages
 
diff --git a/editresP.h b/editresP.h
index 284736f..a9a5677 100644
--- a/editresP.h
+++ b/editresP.h
@@ -38,13 +38,11 @@ in this Software without prior written authorization from The Open Group.
 #  define CLIENT_TIME_OUT 5000	/* wait five seconds for the client. */
 #endif /* DEBUG */
 
-#define PROTOCOL_VERSION_ONE_POINT_ONE  5 /* version 1.1 */
-#define ONE_POINT_ONE_STRING "1.1"
-#define PROTOCOL_VERSION_ONE_POINT_ZERO 4 /* version 1.0 */
-#define ONE_POINT_ZERO_STRING "1.0" ONE_POINT_ONE_STRING
-
-#define CURRENT_PROTOCOL_VERSION PROTOCOL_VERSION_ONE_POINT_ONE
-#define CURRENT_PROTOCOL_VERSION_STRING ONE_POINT_ONE_STRING
+/**
+ * Current version of the editres protocol. Must be kept in sync with
+ * libXmu.
+ */
+#define CURRENT_PROTOCOL_VERSION 5
 
 #define FLASH_TIME  1000	/* Default flash time in microseconds */
 #define NUM_FLASHES 3		/* Default number of flashes. */
diff --git a/handler.c b/handler.c
index 3085344..613da3d 100644
--- a/handler.c
+++ b/handler.c
@@ -521,8 +521,7 @@ ResourceListCallback(Widget list, XtPointer node_ptr, XtPointer junk)
     SetResourceString(list, node_ptr, junk);
 
     /* get the resource value from the application */
-    if (global_effective_protocol_version >=
-	PROTOCOL_VERSION_ONE_POINT_ONE && do_get_values) {
+    if (global_effective_protocol_version >= 5 && do_get_values) {
       ObtainResource(node_ptr);
       do_get_values = False;
     }
diff --git a/utils.c b/utils.c
index a65cf04..8794615 100644
--- a/utils.c
+++ b/utils.c
@@ -855,20 +855,14 @@ GetFailureMessage(ProtocolStream *stream)
 char *
 ProtocolFailure(ProtocolStream *stream)
 {
-    char buf[BUFSIZ];
+    char buf[128];
     unsigned char version;
-    const char* old_version_string;
 
     if (!_XEditResGet8(stream, &version))
 	return(XtNewString(res_labels[35]));
 
-    switch ((int)version) {
-    case PROTOCOL_VERSION_ONE_POINT_ZERO: old_version_string = "1.0"; break;
-    default: old_version_string = "1.0";
-    }
-
     snprintf(buf, sizeof(buf), res_labels[36],
-             CURRENT_PROTOCOL_VERSION_STRING, old_version_string);
+             CURRENT_PROTOCOL_VERSION, version);
     return(XtNewString(buf));
 }