You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by vn...@apache.org on 2018/09/26 12:44:23 UTC
[02/19] guacamole-server git commit: GUACAMOLE-623: Add missin
includes. Remove unnecessary includes.
GUACAMOLE-623: Add missin includes. Remove unnecessary includes.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-server/commit/371eed1f
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-server/tree/371eed1f
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-server/diff/371eed1f
Branch: refs/heads/master
Commit: 371eed1f93c353e0bf2159bcffd77cf6d8bd9716
Parents: 77a8661
Author: Michael Jumper <mj...@apache.org>
Authored: Mon Sep 10 21:05:23 2018 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Tue Sep 25 21:30:51 2018 -0700
----------------------------------------------------------------------
src/protocols/kubernetes/client.c | 9 ++++-----
src/protocols/kubernetes/client.h | 6 +-----
src/protocols/kubernetes/clipboard.c | 2 --
src/protocols/kubernetes/clipboard.h | 2 --
src/protocols/kubernetes/input.c | 5 +----
src/protocols/kubernetes/input.h | 2 --
src/protocols/kubernetes/kubernetes.c | 10 ++--------
src/protocols/kubernetes/kubernetes.h | 4 +++-
src/protocols/kubernetes/pipe.c | 5 +++--
src/protocols/kubernetes/pipe.h | 2 --
src/protocols/kubernetes/settings.c | 5 -----
src/protocols/kubernetes/settings.h | 3 ---
src/protocols/kubernetes/url.c | 2 +-
src/protocols/kubernetes/url.h | 2 --
src/protocols/kubernetes/user.c | 6 +++---
src/protocols/kubernetes/user.h | 2 --
16 files changed, 18 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-server/blob/371eed1f/src/protocols/kubernetes/client.c
----------------------------------------------------------------------
diff --git a/src/protocols/kubernetes/client.c b/src/protocols/kubernetes/client.c
index 450e1e8..58f4728 100644
--- a/src/protocols/kubernetes/client.c
+++ b/src/protocols/kubernetes/client.c
@@ -17,22 +17,21 @@
* under the License.
*/
-#include "config.h"
#include "client.h"
-#include "common/recording.h"
+#include "common/clipboard.h"
#include "kubernetes.h"
#include "settings.h"
-#include "terminal/terminal.h"
#include "user.h"
+#include <guacamole/client.h>
+#include <libwebsockets.h>
+
#include <langinfo.h>
#include <locale.h>
#include <pthread.h>
#include <stdlib.h>
#include <string.h>
-#include <guacamole/client.h>
-
/**
* Static reference to the guac_client associated with the active Kubernetes
* connection. As guacd guarantees that each main client connection is
http://git-wip-us.apache.org/repos/asf/guacamole-server/blob/371eed1f/src/protocols/kubernetes/client.h
----------------------------------------------------------------------
diff --git a/src/protocols/kubernetes/client.h b/src/protocols/kubernetes/client.h
index 2e96d10..0b847da 100644
--- a/src/protocols/kubernetes/client.h
+++ b/src/protocols/kubernetes/client.h
@@ -20,11 +20,7 @@
#ifndef GUAC_KUBERNETES_CLIENT_H
#define GUAC_KUBERNETES_CLIENT_H
-#include "config.h"
-#include "terminal/terminal.h"
-
-#include <pthread.h>
-#include <sys/types.h>
+#include <guacamole/client.h>
/**
* The maximum number of bytes to allow within the clipboard.
http://git-wip-us.apache.org/repos/asf/guacamole-server/blob/371eed1f/src/protocols/kubernetes/clipboard.c
----------------------------------------------------------------------
diff --git a/src/protocols/kubernetes/clipboard.c b/src/protocols/kubernetes/clipboard.c
index 87a34b0..f168206 100644
--- a/src/protocols/kubernetes/clipboard.c
+++ b/src/protocols/kubernetes/clipboard.c
@@ -17,11 +17,9 @@
* under the License.
*/
-#include "config.h"
#include "clipboard.h"
#include "common/clipboard.h"
#include "kubernetes.h"
-#include "terminal/terminal.h"
#include <guacamole/client.h>
#include <guacamole/stream.h>
http://git-wip-us.apache.org/repos/asf/guacamole-server/blob/371eed1f/src/protocols/kubernetes/clipboard.h
----------------------------------------------------------------------
diff --git a/src/protocols/kubernetes/clipboard.h b/src/protocols/kubernetes/clipboard.h
index 009219c..87a393c 100644
--- a/src/protocols/kubernetes/clipboard.h
+++ b/src/protocols/kubernetes/clipboard.h
@@ -20,8 +20,6 @@
#ifndef GUAC_KUBERNETES_CLIPBOARD_H
#define GUAC_KUBERNETES_CLIPBOARD_H
-#include "config.h"
-
#include <guacamole/user.h>
/**
http://git-wip-us.apache.org/repos/asf/guacamole-server/blob/371eed1f/src/protocols/kubernetes/input.c
----------------------------------------------------------------------
diff --git a/src/protocols/kubernetes/input.c b/src/protocols/kubernetes/input.c
index e73772e..814578e 100644
--- a/src/protocols/kubernetes/input.c
+++ b/src/protocols/kubernetes/input.c
@@ -17,18 +17,15 @@
* under the License.
*/
-#include "config.h"
#include "common/recording.h"
-#include "kubernetes.h"
#include "input.h"
+#include "kubernetes.h"
#include "terminal/terminal.h"
#include <guacamole/client.h>
#include <guacamole/user.h>
#include <stdlib.h>
-#include <sys/types.h>
-#include <unistd.h>
int guac_kubernetes_user_mouse_handler(guac_user* user,
int x, int y, int mask) {
http://git-wip-us.apache.org/repos/asf/guacamole-server/blob/371eed1f/src/protocols/kubernetes/input.h
----------------------------------------------------------------------
diff --git a/src/protocols/kubernetes/input.h b/src/protocols/kubernetes/input.h
index ac65835..6f24cf2 100644
--- a/src/protocols/kubernetes/input.h
+++ b/src/protocols/kubernetes/input.h
@@ -20,8 +20,6 @@
#ifndef GUAC_KUBERNETES_INPUT_H
#define GUAC_KUBERNETES_INPUT_H
-#include "config.h"
-
#include <guacamole/user.h>
/**
http://git-wip-us.apache.org/repos/asf/guacamole-server/blob/371eed1f/src/protocols/kubernetes/kubernetes.c
----------------------------------------------------------------------
diff --git a/src/protocols/kubernetes/kubernetes.c b/src/protocols/kubernetes/kubernetes.c
index 9850c6d..3644d6e 100644
--- a/src/protocols/kubernetes/kubernetes.c
+++ b/src/protocols/kubernetes/kubernetes.c
@@ -18,8 +18,8 @@
*/
#include "config.h"
-#include "common/recording.h"
#include "kubernetes.h"
+#include "common/recording.h"
#include "terminal/terminal.h"
#include "url.h"
@@ -27,16 +27,10 @@
#include <guacamole/protocol.h>
#include <libwebsockets.h>
-#include <errno.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <poll.h>
#include <pthread.h>
+#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <unistd.h>
/**
* Handles data received from Kubernetes over WebSocket, decoding the channel
http://git-wip-us.apache.org/repos/asf/guacamole-server/blob/371eed1f/src/protocols/kubernetes/kubernetes.h
----------------------------------------------------------------------
diff --git a/src/protocols/kubernetes/kubernetes.h b/src/protocols/kubernetes/kubernetes.h
index fedf77a..8c9a25e 100644
--- a/src/protocols/kubernetes/kubernetes.h
+++ b/src/protocols/kubernetes/kubernetes.h
@@ -20,13 +20,15 @@
#ifndef GUAC_KUBERNETES_H
#define GUAC_KUBERNETES_H
-#include "config.h"
#include "common/clipboard.h"
#include "common/recording.h"
#include "settings.h"
#include "terminal/terminal.h"
+#include <guacamole/client.h>
#include <libwebsockets.h>
+
+#include <pthread.h>
#include <stdint.h>
/**
http://git-wip-us.apache.org/repos/asf/guacamole-server/blob/371eed1f/src/protocols/kubernetes/pipe.c
----------------------------------------------------------------------
diff --git a/src/protocols/kubernetes/pipe.c b/src/protocols/kubernetes/pipe.c
index 242105b..8f18530 100644
--- a/src/protocols/kubernetes/pipe.c
+++ b/src/protocols/kubernetes/pipe.c
@@ -17,12 +17,13 @@
* under the License.
*/
-#include "config.h"
#include "kubernetes.h"
-#include "pipe.h"
#include "terminal/terminal.h"
+#include "pipe.h"
+#include <guacamole/client.h>
#include <guacamole/protocol.h>
+#include <guacamole/stream-types.h>
#include <guacamole/socket.h>
#include <guacamole/user.h>
http://git-wip-us.apache.org/repos/asf/guacamole-server/blob/371eed1f/src/protocols/kubernetes/pipe.h
----------------------------------------------------------------------
diff --git a/src/protocols/kubernetes/pipe.h b/src/protocols/kubernetes/pipe.h
index 7acae3c..47565bf 100644
--- a/src/protocols/kubernetes/pipe.h
+++ b/src/protocols/kubernetes/pipe.h
@@ -21,8 +21,6 @@
#ifndef GUAC_KUBERNETES_PIPE_H
#define GUAC_KUBERNETES_PIPE_H
-#include "config.h"
-
#include <guacamole/user.h>
/**
http://git-wip-us.apache.org/repos/asf/guacamole-server/blob/371eed1f/src/protocols/kubernetes/settings.c
----------------------------------------------------------------------
diff --git a/src/protocols/kubernetes/settings.c b/src/protocols/kubernetes/settings.c
index 4f9f3f2..122a858 100644
--- a/src/protocols/kubernetes/settings.c
+++ b/src/protocols/kubernetes/settings.c
@@ -17,16 +17,11 @@
* under the License.
*/
-#include "config.h"
-
#include "settings.h"
#include <guacamole/user.h>
-#include <sys/types.h>
#include <stdlib.h>
-#include <string.h>
-#include <time.h>
/* Client plugin arguments */
const char* GUAC_KUBERNETES_CLIENT_ARGS[] = {
http://git-wip-us.apache.org/repos/asf/guacamole-server/blob/371eed1f/src/protocols/kubernetes/settings.h
----------------------------------------------------------------------
diff --git a/src/protocols/kubernetes/settings.h b/src/protocols/kubernetes/settings.h
index c2e479e..a86d14a 100644
--- a/src/protocols/kubernetes/settings.h
+++ b/src/protocols/kubernetes/settings.h
@@ -20,11 +20,8 @@
#ifndef GUAC_KUBERNETES_SETTINGS_H
#define GUAC_KUBERNETES_SETTINGS_H
-#include "config.h"
-
#include <guacamole/user.h>
-#include <sys/types.h>
#include <stdbool.h>
/**
http://git-wip-us.apache.org/repos/asf/guacamole-server/blob/371eed1f/src/protocols/kubernetes/url.c
----------------------------------------------------------------------
diff --git a/src/protocols/kubernetes/url.c b/src/protocols/kubernetes/url.c
index cfd6f74..434cc87 100644
--- a/src/protocols/kubernetes/url.c
+++ b/src/protocols/kubernetes/url.c
@@ -17,10 +17,10 @@
* under the License.
*/
-#include "config.h"
#include "url.h"
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
static int guac_kubernetes_is_url_safe(char c) {
http://git-wip-us.apache.org/repos/asf/guacamole-server/blob/371eed1f/src/protocols/kubernetes/url.h
----------------------------------------------------------------------
diff --git a/src/protocols/kubernetes/url.h b/src/protocols/kubernetes/url.h
index 19084ee..285baa2 100644
--- a/src/protocols/kubernetes/url.h
+++ b/src/protocols/kubernetes/url.h
@@ -20,8 +20,6 @@
#ifndef GUAC_KUBERNETES_URL_H
#define GUAC_KUBERNETES_URL_H
-#include "config.h"
-
/**
* The maximum number of characters allowed in the full path for any Kubernetes
* endpoint.
http://git-wip-us.apache.org/repos/asf/guacamole-server/blob/371eed1f/src/protocols/kubernetes/user.c
----------------------------------------------------------------------
diff --git a/src/protocols/kubernetes/user.c b/src/protocols/kubernetes/user.c
index 62666cb..f90260e 100644
--- a/src/protocols/kubernetes/user.c
+++ b/src/protocols/kubernetes/user.c
@@ -17,9 +17,8 @@
* under the License.
*/
-#include "config.h"
-
#include "clipboard.h"
+#include "common/cursor.h"
#include "input.h"
#include "kubernetes.h"
#include "pipe.h"
@@ -28,11 +27,12 @@
#include "user.h"
#include <guacamole/client.h>
+#include <guacamole/protocol.h>
#include <guacamole/socket.h>
#include <guacamole/user.h>
#include <pthread.h>
-#include <string.h>
+#include <stdlib.h>
int guac_kubernetes_user_join_handler(guac_user* user, int argc, char** argv) {
http://git-wip-us.apache.org/repos/asf/guacamole-server/blob/371eed1f/src/protocols/kubernetes/user.h
----------------------------------------------------------------------
diff --git a/src/protocols/kubernetes/user.h b/src/protocols/kubernetes/user.h
index d235b2b..55d49fd 100644
--- a/src/protocols/kubernetes/user.h
+++ b/src/protocols/kubernetes/user.h
@@ -20,8 +20,6 @@
#ifndef GUAC_KUBERNETES_USER_H
#define GUAC_KUBERNETES_USER_H
-#include "config.h"
-
#include <guacamole/user.h>
/**