diff options
| author |  Martin Szulecki | 2013-02-27 15:02:20 +0100 |
|---|---|---|
| committer | Martin Szulecki | 2013-02-27 15:02:20 +0100 |
| commit | 82429cd891bb26f2c5b77ff90e3e62eb60434bc6 (patch) | |
| tree | 153028634b09716cb8606f224cf6ee89dcb3fb69 | |
| parent | d5f91e4cfbe0ae7f9c909ab1061384bff75cd4c4 (diff) | |
| download | libimobiledevice-82429cd891bb26f2c5b77ff90e3e62eb60434bc6.tar.gz libimobiledevice-82429cd891bb26f2c5b77ff90e3e62eb60434bc6.tar.bz2 | |
Make all "include guards" for all headers consistent
33 files changed, 84 insertions, 65 deletions
diff --git a/include/asprintf.h b/include/asprintf.h index 65957e0..ce26aed 100644 --- a/include/asprintf.h +++ b/include/asprintf.h @@ -1,5 +1,5 @@ -#ifndef ASPRINTF_H -#define ASPRINTF_H +#ifndef __ASPRINTF_H +#define __ASPRINTF_H #ifdef HAVE_CONFIG_H #include <config.h> diff --git a/include/libimobiledevice/afc.h b/include/libimobiledevice/afc.h index 1b4ad5b..df3aaa6 100644 --- a/include/libimobiledevice/afc.h +++ b/include/libimobiledevice/afc.h @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AFC_H -#define AFC_H +#ifndef IAFC_H +#define IAFC_H #ifdef __cplusplus extern "C" { diff --git a/include/libimobiledevice/house_arrest.h b/include/libimobiledevice/house_arrest.h index 171bc5f..f12be26 100644 --- a/include/libimobiledevice/house_arrest.h +++ b/include/libimobiledevice/house_arrest.h @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef HOUSE_ARREST_H -#define HOUSE_ARREST_H +#ifndef IHOUSE_ARREST_H +#define IHOUSE_ARREST_H #ifdef __cplusplus extern "C" { diff --git a/include/libimobiledevice/installation_proxy.h b/include/libimobiledevice/installation_proxy.h index 6a20c0b..049c0d7 100644 --- a/include/libimobiledevice/installation_proxy.h +++ b/include/libimobiledevice/installation_proxy.h @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef INSTALLATION_PROXY_H -#define INSTALLATION_PROXY_H +#ifndef IINSTALLATION_PROXY_H +#define IINSTALLATION_PROXY_H #ifdef __cplusplus extern "C" { diff --git a/include/libimobiledevice/libimobiledevice.h b/include/libimobiledevice/libimobiledevice.h index f7b747a..06363bd 100644 --- a/include/libimobiledevice/libimobiledevice.h +++ b/include/libimobiledevice/libimobiledevice.h @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef LIBIMOBILEDEVICE_H -#define LIBIMOBILEDEVICE_H +#ifndef IMOBILEDEVICE_H +#define IMOBILEDEVICE_H #ifdef __cplusplus extern "C" { diff --git a/include/libimobiledevice/lockdown.h b/include/libimobiledevice/lockdown.h index 287d3f6..8d1b324 100644 --- a/include/libimobiledevice/lockdown.h +++ b/include/libimobiledevice/lockdown.h @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef LOCKDOWN_H -#define LOCKDOWN_H +#ifndef ILOCKDOWN_H +#define ILOCKDOWN_H #ifdef __cplusplus extern "C" { diff --git a/include/libimobiledevice/misagent.h b/include/libimobiledevice/misagent.h index 3adfd9d..bf6985f 100644 --- a/include/libimobiledevice/misagent.h +++ b/include/libimobiledevice/misagent.h @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef MISAGENT_H -#define MISAGENT_H +#ifndef IMISAGENT_H +#define IMISAGENT_H #ifdef __cplusplus extern "C" { diff --git a/include/libimobiledevice/mobile_image_mounter.h b/include/libimobiledevice/mobile_image_mounter.h index a9f500d..6aee1e7 100644 --- a/include/libimobiledevice/mobile_image_mounter.h +++ b/include/libimobiledevice/mobile_image_mounter.h @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef MOBILE_IMAGE_MOUNTER_H -#define MOBILE_IMAGE_MOUNTER_H +#ifndef IMOBILE_IMAGE_MOUNTER_H +#define IMOBILE_IMAGE_MOUNTER_H #ifdef __cplusplus extern "C" { diff --git a/include/libimobiledevice/notification_proxy.h b/include/libimobiledevice/notification_proxy.h index 3f883e5..c683564 100644 --- a/include/libimobiledevice/notification_proxy.h +++ b/include/libimobiledevice/notification_proxy.h @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef NOTIFICATION_PROXY_H -#define NOTIFICATION_PROXY_H +#ifndef INOTIFICATION_PROXY_H +#define INOTIFICATION_PROXY_H #ifdef __cplusplus extern "C" { diff --git a/include/libimobiledevice/restore.h b/include/libimobiledevice/restore.h index a895a7f..584adb4 100644 --- a/include/libimobiledevice/restore.h +++ b/include/libimobiledevice/restore.h @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef RESTORE_H -#define RESTORE_H +#ifndef IRESTORE_H +#define IRESTORE_H #ifdef __cplusplus extern "C" { diff --git a/include/libimobiledevice/sbservices.h b/include/libimobiledevice/sbservices.h index 55d8b93..93bb496 100644 --- a/include/libimobiledevice/sbservices.h +++ b/include/libimobiledevice/sbservices.h @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef SB_SERVICES_H -#define SB_SERVICES_H +#ifndef ISB_SERVICES_H +#define ISB_SERVICES_H #ifdef __cplusplus extern "C" { @@ -19,6 +19,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef __AFC_H +#define __AFC_H + #include <stdint.h> #ifdef WIN32 #include <windows.h> @@ -99,3 +102,4 @@ enum { AFC_OP_SET_FILE_TIME = 0x0000001E /* set st_mtime */ }; +#endif diff --git a/src/debug.h b/src/debug.h index cb1bf97..b7cff80 100644 --- a/src/debug.h +++ b/src/debug.h @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef DEBUG_H -#define DEBUG_H +#ifndef __DEBUG_H +#define __DEBUG_H #include <plist/plist.h> diff --git a/src/device_link_service.h b/src/device_link_service.h index d625341..2469877 100644 --- a/src/device_link_service.h +++ b/src/device_link_service.h @@ -18,8 +18,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef DEVICE_LINK_SERVICE_H -#define DEVICE_LINK_SERVICE_H + +#ifndef __DEVICE_LINK_SERVICE_H +#define __DEVICE_LINK_SERVICE_H #include "property_list_service.h" diff --git a/src/diagnostics_relay.h b/src/diagnostics_relay.h index 2a9eb1a..eb1a21b 100644 --- a/src/diagnostics_relay.h +++ b/src/diagnostics_relay.h @@ -18,8 +18,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef DIAGNOSTICS_RELAY_H -#define DIAGNOSTICS_RELAY_H + +#ifndef __DIAGNOSTICS_RELAY_H +#define __DIAGNOSTICS_RELAY_H #include "libimobiledevice/diagnostics_relay.h" #include "property_list_service.h" diff --git a/src/file_relay.h b/src/file_relay.h index 5e5bb36..c476a38 100644 --- a/src/file_relay.h +++ b/src/file_relay.h @@ -18,8 +18,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FILE_RELAY_H -#define FILE_RELAY_H + +#ifndef __FILE_RELAY_H +#define __FILE_RELAY_H #include "libimobiledevice/file_relay.h" #include "property_list_service.h" diff --git a/src/heartbeat.h b/src/heartbeat.h index f2e9aa3..84e27fe 100644 --- a/src/heartbeat.h +++ b/src/heartbeat.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef HEARTBEAT_H -#define HEARTBEAT_H +#ifndef __HEARTBEAT_H +#define __HEARTBEAT_H #include "libimobiledevice/heartbeat.h" #include "property_list_service.h" diff --git a/src/house_arrest.h b/src/house_arrest.h index 708f1b5..f050213 100644 --- a/src/house_arrest.h +++ b/src/house_arrest.h @@ -18,8 +18,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef IHOUSE_ARREST_H -#define IHOUSE_ARREST_H + +#ifndef __HOUSE_ARREST_H +#define __HOUSE_ARREST_H #include "libimobiledevice/house_arrest.h" #include "property_list_service.h" diff --git a/src/idevice.h b/src/idevice.h index 130d11e..0833090 100644 --- a/src/idevice.h +++ b/src/idevice.h @@ -18,8 +18,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef IDEVICE_H -#define IDEVICE_H + +#ifndef __DEVICE_H +#define __DEVICE_H #ifdef HAVE_CONFIG_H #include <config.h> diff --git a/src/installation_proxy.h b/src/installation_proxy.h index 642968d..40175a0 100644 --- a/src/installation_proxy.h +++ b/src/installation_proxy.h @@ -18,8 +18,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef IINSTALLATION_PROXY_H -#define IINSTALLATION_PROXY_H + +#ifndef __INSTALLATION_PROXY_H +#define __INSTALLATION_PROXY_H #ifdef WIN32 #include <windows.h> diff --git a/src/lockdown.h b/src/lockdown.h index 289053a..59b1659 100644 --- a/src/lockdown.h +++ b/src/lockdown.h @@ -1,5 +1,5 @@ /* - * lockdownd.h + * lockdown.h * Defines lockdown stuff, like the client struct. * * Copyright (c) 2008 Zach C. All Rights Reserved. @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef LOCKDOWND_H -#define LOCKDOWND_H +#ifndef __LOCKDOWND_H +#define __LOCKDOWND_H #include "userpref.h" diff --git a/src/misagent.h b/src/misagent.h index 00f5ad1..b5035f1 100644 --- a/src/misagent.h +++ b/src/misagent.h @@ -18,8 +18,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef IMISAGENT_H -#define IMISAGENT_H + +#ifndef __MISAGENT_H +#define __MISAGENT_H #include "libimobiledevice/misagent.h" #include "property_list_service.h" diff --git a/src/mobile_image_mounter.h b/src/mobile_image_mounter.h index ff0690d..4056dc8 100644 --- a/src/mobile_image_mounter.h +++ b/src/mobile_image_mounter.h @@ -18,8 +18,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef IMOBILE_IMAGE_MOUNTER_H -#define IMOBILE_IMAGE_MOUNTER_H + +#ifndef __MOBILE_IMAGE_MOUNTER_H +#define __MOBILE_IMAGE_MOUNTER_H #ifdef WIN32 #include <windows.h> diff --git a/src/mobilebackup.h b/src/mobilebackup.h index 2c5be62..a373105 100644 --- a/src/mobilebackup.h +++ b/src/mobilebackup.h @@ -18,8 +18,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef MOBILEBACKUP_H -#define MOBILEBACKUP_H + +#ifndef __MOBILEBACKUP_H +#define __MOBILEBACKUP_H #include "libimobiledevice/mobilebackup.h" #include "device_link_service.h" diff --git a/src/mobilebackup2.h b/src/mobilebackup2.h index f96e400..66d4a42 100644 --- a/src/mobilebackup2.h +++ b/src/mobilebackup2.h @@ -18,8 +18,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef MOBILEBACKUP2_H -#define MOBILEBACKUP2_H + +#ifndef __MOBILEBACKUP2_H +#define __MOBILEBACKUP2_H #include "libimobiledevice/mobilebackup2.h" #include "device_link_service.h" diff --git a/src/mobilesync.h b/src/mobilesync.h index 24e61af..b0e7d4c 100644 --- a/src/mobilesync.h +++ b/src/mobilesync.h @@ -19,8 +19,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef MOBILESYNC_H -#define MOBILESYNC_H + +#ifndef __MOBILESYNC_H +#define __MOBILESYNC_H #include "libimobiledevice/mobilesync.h" #include "device_link_service.h" diff --git a/src/notification_proxy.h b/src/notification_proxy.h index 0f92cdf..d8e9915 100644 --- a/src/notification_proxy.h +++ b/src/notification_proxy.h @@ -18,8 +18,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef INOTIFICATION_PROXY_H -#define INOTIFICATION_PROXY_H + +#ifndef __NOTIFICATION_PROXY_H +#define __NOTIFICATION_PROXY_H #ifdef WIN32 #include <windows.h> diff --git a/src/property_list_service.h b/src/property_list_service.h index db1c09d..8b15c09 100644 --- a/src/property_list_service.h +++ b/src/property_list_service.h @@ -18,8 +18,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef PROPERTY_LIST_SERVICE_H -#define PROPERTY_LIST_SERVICE_H + +#ifndef __PROPERTY_LIST_SERVICE_H +#define __PROPERTY_LIST_SERVICE_H #include <libimobiledevice/lockdown.h> #include "idevice.h" diff --git a/src/restore.h b/src/restore.h index cf9307c..646d1d1 100644 --- a/src/restore.h +++ b/src/restore.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef RESTORED_H -#define RESTORED_H +#ifndef __RESTORED_H +#define __RESTORED_H #include <string.h> diff --git a/src/sbservices.h b/src/sbservices.h index 2b600ad..598b794 100644 --- a/src/sbservices.h +++ b/src/sbservices.h @@ -18,8 +18,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef ISBSERVICES_H -#define ISBSERVICES_H + +#ifndef __SBSERVICES_H +#define __SBSERVICES_H #ifdef WIN32 #include <windows.h> diff --git a/src/screenshotr.h b/src/screenshotr.h index df6774a..2dadee8 100644 --- a/src/screenshotr.h +++ b/src/screenshotr.h @@ -18,8 +18,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef SCREENSHOTR_H -#define SCREENSHOTR_H + +#ifndef __SCREENSHOTR_H +#define __SCREENSHOTR_H #include "libimobiledevice/screenshotr.h" #include "device_link_service.h" diff --git a/src/userpref.h b/src/userpref.h index 7ff91b3..14db985 100644 --- a/src/userpref.h +++ b/src/userpref.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef USERPREF_H -#define USERPREF_H +#ifndef __USERPREF_H +#define __USERPREF_H #ifdef HAVE_CONFIG_H #include <config.h> diff --git a/src/webinspector.h b/src/webinspector.h index 3f19303..ab04a70 100644 --- a/src/webinspector.h +++ b/src/webinspector.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef WEBINSPECTOR_H -#define WEBINSPECTOR_H +#ifndef __WEBINSPECTOR_H +#define __WEBINSPECTOR_H #include "libimobiledevice/webinspector.h" #include "property_list_service.h" |