From 4752863b5b9e1326d215aa7c396a1f36ca2abc1d Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Mon, 23 Dec 2019 13:35:32 -0800 Subject: [PATCH] GUACAMOLE-249: Remove now-unnecessary status.h FreeRDP compatibility header. --- src/protocols/rdp/Makefile.am | 1 - .../rdpdr/rdpdr-fs-messages-dir-info.c | 2 +- .../rdpdr/rdpdr-fs-messages-file-info.c | 2 +- .../rdpdr/rdpdr-fs-messages-vol-info.c | 2 +- .../rdp/channels/rdpdr/rdpdr-fs-messages.c | 2 +- .../rdp/channels/rdpdr/rdpdr-printer.c | 2 +- src/protocols/rdp/fs.c | 2 +- src/protocols/rdp/status.h | 65 ------------------- 8 files changed, 6 insertions(+), 72 deletions(-) delete mode 100644 src/protocols/rdp/status.h diff --git a/src/protocols/rdp/Makefile.am b/src/protocols/rdp/Makefile.am index 880df9bb..3ba1da05 100644 --- a/src/protocols/rdp/Makefile.am +++ b/src/protocols/rdp/Makefile.am @@ -113,7 +113,6 @@ noinst_HEADERS = \ rdp.h \ resolution.h \ settings.h \ - status.h \ stream.h \ unicode.h \ user.h diff --git a/src/protocols/rdp/channels/rdpdr/rdpdr-fs-messages-dir-info.c b/src/protocols/rdp/channels/rdpdr/rdpdr-fs-messages-dir-info.c index 1a445d0a..256ac14a 100644 --- a/src/protocols/rdp/channels/rdpdr/rdpdr-fs-messages-dir-info.c +++ b/src/protocols/rdp/channels/rdpdr/rdpdr-fs-messages-dir-info.c @@ -20,10 +20,10 @@ #include "config.h" #include "channels/rdpdr/rdpdr.h" #include "fs.h" -#include "status.h" #include "unicode.h" #include +#include #include #include diff --git a/src/protocols/rdp/channels/rdpdr/rdpdr-fs-messages-file-info.c b/src/protocols/rdp/channels/rdpdr/rdpdr-fs-messages-file-info.c index ee134e51..4629ca59 100644 --- a/src/protocols/rdp/channels/rdpdr/rdpdr-fs-messages-file-info.c +++ b/src/protocols/rdp/channels/rdpdr/rdpdr-fs-messages-file-info.c @@ -20,9 +20,9 @@ #include "config.h" #include "channels/rdpdr/rdpdr.h" #include "fs.h" -#include "status.h" #include "unicode.h" +#include #include #include diff --git a/src/protocols/rdp/channels/rdpdr/rdpdr-fs-messages-vol-info.c b/src/protocols/rdp/channels/rdpdr/rdpdr-fs-messages-vol-info.c index c6f90b94..77f4cce8 100644 --- a/src/protocols/rdp/channels/rdpdr/rdpdr-fs-messages-vol-info.c +++ b/src/protocols/rdp/channels/rdpdr/rdpdr-fs-messages-vol-info.c @@ -21,9 +21,9 @@ #include "channels/rdpdr/rdpdr-messages.h" #include "channels/rdpdr/rdpdr.h" #include "fs.h" -#include "status.h" #include +#include #include #include diff --git a/src/protocols/rdp/channels/rdpdr/rdpdr-fs-messages.c b/src/protocols/rdp/channels/rdpdr/rdpdr-fs-messages.c index 38727ec9..bdf76f6c 100644 --- a/src/protocols/rdp/channels/rdpdr/rdpdr-fs-messages.c +++ b/src/protocols/rdp/channels/rdpdr/rdpdr-fs-messages.c @@ -25,11 +25,11 @@ #include "channels/rdpdr/rdpdr-messages.h" #include "channels/rdpdr/rdpdr.h" #include "fs.h" -#include "status.h" #include "unicode.h" #include #include +#include #include #include diff --git a/src/protocols/rdp/channels/rdpdr/rdpdr-printer.c b/src/protocols/rdp/channels/rdpdr/rdpdr-printer.c index 8ee8bb7b..c3359631 100644 --- a/src/protocols/rdp/channels/rdpdr/rdpdr-printer.c +++ b/src/protocols/rdp/channels/rdpdr/rdpdr-printer.c @@ -23,7 +23,6 @@ #include "channels/rdpdr/rdpdr.h" #include "print-job.h" #include "rdp.h" -#include "status.h" #include "unicode.h" #include @@ -33,6 +32,7 @@ #include #include #include +#include #include #include diff --git a/src/protocols/rdp/fs.c b/src/protocols/rdp/fs.c index 68689cd2..0b39d836 100644 --- a/src/protocols/rdp/fs.c +++ b/src/protocols/rdp/fs.c @@ -20,7 +20,6 @@ #include "config.h" #include "fs.h" -#include "status.h" #include "stream.h" #include @@ -29,6 +28,7 @@ #include #include #include +#include #include #include diff --git a/src/protocols/rdp/status.h b/src/protocols/rdp/status.h deleted file mode 100644 index a624732f..00000000 --- a/src/protocols/rdp/status.h +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -#ifndef GUAC_RDP_STATUS_H -#define GUAC_RDP_STATUS_H - -/** - * RDP-specific status constants. - * - * @file rdp_status.h - */ - -#include "config.h" - -/* Include any constants from winpr/file.h, if available */ - -#ifdef ENABLE_WINPR -#include -#endif - -/* Constants which MAY be defined within FreeRDP */ - -#ifndef STATUS_SUCCESS -#define STATUS_SUCCESS 0x00000000 -#define STATUS_NO_MORE_FILES 0x80000006 -#define STATUS_DEVICE_OFF_LINE 0x80000010 -#define STATUS_NOT_IMPLEMENTED 0xC0000002 -#define STATUS_INVALID_PARAMETER 0xC000000D -#define STATUS_NO_SUCH_FILE 0xC000000F -#define STATUS_END_OF_FILE 0xC0000011 -#define STATUS_ACCESS_DENIED 0xC0000022 -#define STATUS_OBJECT_NAME_COLLISION 0xC0000035 -#define STATUS_DISK_FULL 0xC000007F -#define STATUS_FILE_INVALID 0xC0000098 -#define STATUS_FILE_IS_A_DIRECTORY 0xC00000BA -#define STATUS_NOT_SUPPORTED 0xC00000BB -#define STATUS_NOT_A_DIRECTORY 0xC0000103 -#define STATUS_TOO_MANY_OPENED_FILES 0xC000011F -#define STATUS_CANNOT_DELETE 0xC0000121 -#define STATUS_FILE_DELETED 0xC0000123 -#define STATUS_FILE_CLOSED 0xC0000128 -#endif - -/* Constants which are NEVER defined within FreeRDP */ - -#define STATUS_FILE_SYSTEM_LIMITATION 0xC0000427 -#define STATUS_FILE_TOO_LARGE 0xC0000904 - -#endif