From 81c9d8452c30c8a87b3799cbb73fd69b0a31c520 Mon Sep 17 00:00:00 2001
From: Andri Yngvason <andri@yngvason.is>
Date: Wed, 6 Jul 2022 21:16:58 +0000
Subject: [PATCH] Remove rfb/ include prefix

This avoids accidentally including libvncclient's public API.
---
 include/{rfb => }/keysym.h    |  0
 include/open-h264.h           |  2 +-
 include/{rfb => }/rfbclient.h | 10 +++++-----
 include/{rfb => }/rfbproto.h  |  0
 include/sasl.h                |  2 +-
 include/{rfb => }/threading.h |  0
 include/vnc.h                 |  2 +-
 src/cursor.c                  |  2 +-
 src/encodings/vncauth.c       |  2 +-
 src/open-h264.c               |  2 +-
 src/rfbproto.c                |  2 +-
 src/sasl.c                    |  2 +-
 src/sockets.c                 |  2 +-
 src/tls_gnutls.c              |  2 +-
 src/tls_none.c                |  2 +-
 src/tls_openssl.c             |  2 +-
 src/vnc.c                     |  2 +-
 src/vncviewer.c               |  2 +-
 18 files changed, 19 insertions(+), 19 deletions(-)
 rename include/{rfb => }/keysym.h (100%)
 rename include/{rfb => }/rfbclient.h (99%)
 rename include/{rfb => }/rfbproto.h (100%)
 rename include/{rfb => }/threading.h (100%)

diff --git a/include/rfb/keysym.h b/include/keysym.h
similarity index 100%
rename from include/rfb/keysym.h
rename to include/keysym.h
diff --git a/include/open-h264.h b/include/open-h264.h
index d05dc6c..7491ee8 100644
--- a/include/open-h264.h
+++ b/include/open-h264.h
@@ -18,7 +18,7 @@
 
 #define OPEN_H264_MAX_CONTEXTS 64
 
-#include "rfb/rfbclient.h"
+#include "rfbclient.h"
 
 #include <stdbool.h>
 
diff --git a/include/rfb/rfbclient.h b/include/rfbclient.h
similarity index 99%
rename from include/rfb/rfbclient.h
rename to include/rfbclient.h
index aac67d9..073ba03 100644
--- a/include/rfb/rfbclient.h
+++ b/include/rfbclient.h
@@ -32,9 +32,9 @@
  * @file rfbclient.h
  */
 
-#include "rfb/rfbproto.h"
-#include "rfb/keysym.h"
-#include "rfb/threading.h"
+#include "rfbproto.h"
+#include "keysym.h"
+#include "threading.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -569,7 +569,7 @@ extern rfbBool SendExtDesktopSize(rfbClient* client, uint16_t width, uint16_t he
  * viewer (i.e. it controls the server), you'll want to send the keys that the
  * user presses to the server. Use this function to do that.
  * @param client The client through which to send the key event
- * @param key An rfbKeySym defined in rfb/keysym.h
+ * @param key An rfbKeySym defined in keysym.h
  * @param down true if this was a key down event, false otherwise
  * @return true if the key event was send successfully, false otherwise
  */
@@ -578,7 +578,7 @@ extern rfbBool SendKeyEvent(rfbClient* client,uint32_t key, rfbBool down);
  * The same as SendKeyEvent, except a key code will be sent along with the
  * symbol if the server supports extended key events.
  * @param client The client through which to send the key event
- * @param keysym An rfbKeySym defined in rfb/keysym.h
+ * @param keysym An rfbKeySym defined in keysym.h
  * @param keycode An XT key code
  * @param down true if this was a key down event, false otherwise
  * @return true if the extended key event is supported and was sent
diff --git a/include/rfb/rfbproto.h b/include/rfbproto.h
similarity index 100%
rename from include/rfb/rfbproto.h
rename to include/rfbproto.h
diff --git a/include/sasl.h b/include/sasl.h
index df45f59..14db5ce 100644
--- a/include/sasl.h
+++ b/include/sasl.h
@@ -22,7 +22,7 @@
 
 #ifdef LIBVNCSERVER_HAVE_SASL
 
-#include "rfb/rfbclient.h"
+#include "rfbclient.h"
 
 /*
  *  Perform the SASL authentication process
diff --git a/include/rfb/threading.h b/include/threading.h
similarity index 100%
rename from include/rfb/threading.h
rename to include/threading.h
diff --git a/include/vnc.h b/include/vnc.h
index 450d3bd..bd36831 100644
--- a/include/vnc.h
+++ b/include/vnc.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "rfb/rfbclient.h"
+#include "rfbclient.h"
 
 #include <stdbool.h>
 #include <unistd.h>
diff --git a/src/cursor.c b/src/cursor.c
index 440a8ff..51a8cf7 100644
--- a/src/cursor.c
+++ b/src/cursor.c
@@ -22,7 +22,7 @@
  * RichCursor preudo-encodings).
  */
 
-#include "rfb/rfbclient.h"
+#include "rfbclient.h"
 
 #define OPER_SAVE     0
 #define OPER_RESTORE  1
diff --git a/src/encodings/vncauth.c b/src/encodings/vncauth.c
index 83f66fa..239953d 100644
--- a/src/encodings/vncauth.c
+++ b/src/encodings/vncauth.c
@@ -21,7 +21,7 @@
  * vncauth.c - Functions for VNC password management and authentication.
  */
 
-#include "rfb/rfbproto.h"
+#include "rfbproto.h"
 #include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/open-h264.c b/src/open-h264.c
index a082a34..662210d 100644
--- a/src/open-h264.c
+++ b/src/open-h264.c
@@ -15,7 +15,7 @@
  */
 
 #include "open-h264.h"
-#include "rfb/rfbclient.h"
+#include "rfbclient.h"
 
 #include <stdint.h>
 #include <stdbool.h>
diff --git a/src/rfbproto.c b/src/rfbproto.c
index b34ba61..f2f045a 100644
--- a/src/rfbproto.c
+++ b/src/rfbproto.c
@@ -31,7 +31,7 @@
 #include <errno.h>
 #include <assert.h>
 
-#include "rfb/rfbclient.h"
+#include "rfbclient.h"
 #ifdef LIBVNCSERVER_HAVE_LIBZ
 #include <zlib.h>
 #ifdef __CHECKER__
diff --git a/src/sasl.c b/src/sasl.c
index 65746b6..fccfbd5 100644
--- a/src/sasl.c
+++ b/src/sasl.c
@@ -30,7 +30,7 @@
  */
 
 #include <errno.h>
-#include "rfb/rfbclient.h"
+#include "rfbclient.h"
 
 #include "sockets.h"
 
diff --git a/src/sockets.c b/src/sockets.c
index e5a2b3b..a5901c5 100644
--- a/src/sockets.c
+++ b/src/sockets.c
@@ -29,7 +29,7 @@
 #include <assert.h>
 #include <sys/param.h>
 #include <poll.h>
-#include "rfb/rfbclient.h"
+#include "rfbclient.h"
 #include "sockets.h"
 #include "tls.h"
 #include "sasl.h"
diff --git a/src/tls_gnutls.c b/src/tls_gnutls.c
index d6679e0..2619959 100644
--- a/src/tls_gnutls.c
+++ b/src/tls_gnutls.c
@@ -17,7 +17,7 @@
  *  USA.
  */
 
-#include "rfb/rfbclient.h"
+#include "rfbclient.h"
 #include "tls.h"
 
 #include <stdio.h>
diff --git a/src/tls_none.c b/src/tls_none.c
index fe60182..65fa389 100644
--- a/src/tls_none.c
+++ b/src/tls_none.c
@@ -17,7 +17,7 @@
  *  USA.
  */
 
-#include "rfb/rfbclient.h"
+#include "rfbclient.h"
 #include "tls.h"
 
 #include <errno.h>
diff --git a/src/tls_openssl.c b/src/tls_openssl.c
index 31555a9..95609d4 100644
--- a/src/tls_openssl.c
+++ b/src/tls_openssl.c
@@ -18,7 +18,7 @@
  *  USA.
  */
 
-#include "rfb/rfbclient.h"
+#include "rfbclient.h"
 
 #include <stdio.h>
 #include <errno.h>
diff --git a/src/vnc.c b/src/vnc.c
index 4344421..5ad9151 100644
--- a/src/vnc.c
+++ b/src/vnc.c
@@ -24,7 +24,7 @@
 #include <libdrm/drm_fourcc.h>
 #include <libavutil/frame.h>
 
-#include "rfb/rfbclient.h"
+#include "rfbclient.h"
 #include "vnc.h"
 #include "open-h264.h"
 #include "usdt.h"
diff --git a/src/vncviewer.c b/src/vncviewer.c
index 2ab6ff5..87fc004 100644
--- a/src/vncviewer.c
+++ b/src/vncviewer.c
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include "rfb/rfbclient.h"
+#include "rfbclient.h"
 #include "tls.h"
 
 static void Dummy(rfbClient* client) {