diff options
Diffstat (limited to 'src')
175 files changed, 402 insertions, 447 deletions
diff --git a/src/NetworkManagerUtils.c b/src/NetworkManagerUtils.c index 088811b5f..9e3928f72 100644 --- a/src/NetworkManagerUtils.c +++ b/src/NetworkManagerUtils.c @@ -19,7 +19,7 @@ * Copyright 2005 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <errno.h> #include <fcntl.h> @@ -33,7 +33,6 @@ #include <linux/if.h> #include <linux/if_infiniband.h> -#include "nm-default.h" #include "NetworkManagerUtils.h" #include "nm-platform.h" #include "nm-utils.h" diff --git a/src/devices/adsl/nm-atm-manager.c b/src/devices/adsl/nm-atm-manager.c index d3f1423f6..a3fa4901f 100644 --- a/src/devices/adsl/nm-atm-manager.c +++ b/src/devices/adsl/nm-atm-manager.c @@ -18,13 +18,12 @@ * Copyright (C) 2009 - 2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <gudev/gudev.h> #include <gmodule.h> -#include "nm-default.h" #include "nm-atm-manager.h" #include "nm-setting-adsl.h" #include "nm-device-adsl.h" diff --git a/src/devices/adsl/nm-device-adsl.c b/src/devices/adsl/nm-device-adsl.c index 57afcf463..e7a91e0ae 100644 --- a/src/devices/adsl/nm-device-adsl.c +++ b/src/devices/adsl/nm-device-adsl.c @@ -18,7 +18,7 @@ * Pantelis Koukousoulas <pktoss@gmail.com> */ -#include "config.h" +#include "nm-default.h" #include <sys/socket.h> #include <linux/atmdev.h> @@ -32,7 +32,6 @@ #include <stdlib.h> #include <string.h> -#include "nm-default.h" #include "nm-device-adsl.h" #include "nm-device-private.h" #include "nm-enum-types.h" diff --git a/src/devices/bluetooth/nm-bluez-common.h b/src/devices/bluetooth/nm-bluez-common.h index 4262fa766..67810b94c 100644 --- a/src/devices/bluetooth/nm-bluez-common.h +++ b/src/devices/bluetooth/nm-bluez-common.h @@ -21,8 +21,6 @@ #ifndef __NETWORKMANAGER_BLUEZ_COMMON_H__ #define __NETWORKMANAGER_BLUEZ_COMMON_H__ -#include "config.h" - #define BLUETOOTH_CONNECT_DUN "dun" #define BLUETOOTH_CONNECT_NAP "nap" diff --git a/src/devices/bluetooth/nm-bluez-device.c b/src/devices/bluetooth/nm-bluez-device.c index 2d18c17b5..71226813d 100644 --- a/src/devices/bluetooth/nm-bluez-device.c +++ b/src/devices/bluetooth/nm-bluez-device.c @@ -19,11 +19,10 @@ * Copyright (C) 2013 Intel Corporation. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include "nm-default.h" #include "nm-core-internal.h" #include "nm-bt-error.h" diff --git a/src/devices/bluetooth/nm-bluez-device.h b/src/devices/bluetooth/nm-bluez-device.h index 0e54fcb06..c95605407 100644 --- a/src/devices/bluetooth/nm-bluez-device.h +++ b/src/devices/bluetooth/nm-bluez-device.h @@ -21,9 +21,6 @@ #ifndef __NETWORKMANAGER_BLUEZ_DEVICE_H__ #define __NETWORKMANAGER_BLUEZ_DEVICE_H__ - -#include "config.h" -#include "nm-default.h" #include "nm-connection.h" #include "nm-connection-provider.h" diff --git a/src/devices/bluetooth/nm-bluez-manager.c b/src/devices/bluetooth/nm-bluez-manager.c index b093d4a2d..f66b5abe5 100644 --- a/src/devices/bluetooth/nm-bluez-manager.c +++ b/src/devices/bluetooth/nm-bluez-manager.c @@ -18,14 +18,13 @@ * Copyright (C) 2013 - 2014 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <signal.h> #include <string.h> #include <stdlib.h> #include <gmodule.h> -#include "nm-default.h" #include "nm-bluez-manager.h" #include "nm-device-factory.h" #include "nm-setting-bluetooth.h" diff --git a/src/devices/bluetooth/nm-bluez4-adapter.c b/src/devices/bluetooth/nm-bluez4-adapter.c index 04ae833ae..deeebcb66 100644 --- a/src/devices/bluetooth/nm-bluez4-adapter.c +++ b/src/devices/bluetooth/nm-bluez4-adapter.c @@ -18,11 +18,10 @@ * Copyright (C) 2009 - 2012 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include "nm-default.h" #include "nm-dbus-interface.h" #include "nm-bluez4-adapter.h" #include "nm-bluez-device.h" diff --git a/src/devices/bluetooth/nm-bluez4-manager.c b/src/devices/bluetooth/nm-bluez4-manager.c index c5ba120c6..146612a89 100644 --- a/src/devices/bluetooth/nm-bluez4-manager.c +++ b/src/devices/bluetooth/nm-bluez4-manager.c @@ -19,13 +19,12 @@ * Copyright (C) 2007 - 2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <signal.h> #include <string.h> #include <stdlib.h> -#include "nm-default.h" #include "nm-bluez-manager.h" #include "nm-bluez4-manager.h" #include "nm-bluez4-adapter.h" diff --git a/src/devices/bluetooth/nm-bluez5-dun.c b/src/devices/bluetooth/nm-bluez5-dun.c index 875a662fa..4c93feba6 100644 --- a/src/devices/bluetooth/nm-bluez5-dun.c +++ b/src/devices/bluetooth/nm-bluez5-dun.c @@ -18,7 +18,7 @@ * Copyright (C) 2014 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <sys/socket.h> #include <bluetooth/sdp.h> @@ -32,7 +32,6 @@ #include "nm-bluez5-dun.h" #include "nm-bt-error.h" -#include "nm-default.h" #include "NetworkManagerUtils.h" struct _NMBluez5DunContext { diff --git a/src/devices/bluetooth/nm-bluez5-manager.c b/src/devices/bluetooth/nm-bluez5-manager.c index c9f5828df..e44e87d8a 100644 --- a/src/devices/bluetooth/nm-bluez5-manager.c +++ b/src/devices/bluetooth/nm-bluez5-manager.c @@ -20,13 +20,12 @@ * Copyright (C) 2013 Intel Corporation. */ -#include "config.h" +#include "nm-default.h" #include <signal.h> #include <string.h> #include <stdlib.h> -#include "nm-default.h" #include "nm-bluez-manager.h" #include "nm-bluez5-manager.h" #include "nm-bluez-device.h" diff --git a/src/devices/bluetooth/nm-bt-error.c b/src/devices/bluetooth/nm-bt-error.c index 9c35d8b63..183911873 100644 --- a/src/devices/bluetooth/nm-bt-error.c +++ b/src/devices/bluetooth/nm-bt-error.c @@ -18,9 +18,8 @@ * Copyright (C) 2014 Red Hat, Inc. */ -#include "config.h" - #include "nm-default.h" + #include "nm-bt-error.h" GQuark diff --git a/src/devices/bluetooth/nm-device-bt.c b/src/devices/bluetooth/nm-device-bt.c index 1e3f9cdc8..e151b7955 100644 --- a/src/devices/bluetooth/nm-device-bt.c +++ b/src/devices/bluetooth/nm-device-bt.c @@ -18,12 +18,11 @@ * Copyright (C) 2009 - 2011 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <stdio.h> #include <string.h> -#include "nm-default.h" #include "nm-bluez-common.h" #include "nm-bluez-device.h" #include "nm-device-bt.h" diff --git a/src/devices/nm-arping-manager.c b/src/devices/nm-arping-manager.c index d8791c486..ea10609f2 100644 --- a/src/devices/nm-arping-manager.c +++ b/src/devices/nm-arping-manager.c @@ -14,13 +14,12 @@ * Copyright (C) 2015 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <netinet/in.h> #include <sys/types.h> #include <sys/wait.h> -#include "nm-default.h" #include "nm-arping-manager.h" #include "nm-platform.h" #include "nm-utils.h" diff --git a/src/devices/nm-device-bond.c b/src/devices/nm-device-bond.c index cef3f9b3b..cef104e67 100644 --- a/src/devices/nm-device-bond.c +++ b/src/devices/nm-device-bond.c @@ -18,12 +18,11 @@ * Copyright 2011 - 2012 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <errno.h> #include <stdlib.h> -#include "nm-default.h" #include "nm-device-bond.h" #include "NetworkManagerUtils.h" #include "nm-device-private.h" diff --git a/src/devices/nm-device-bridge.c b/src/devices/nm-device-bridge.c index e00821390..cc72b003a 100644 --- a/src/devices/nm-device-bridge.c +++ b/src/devices/nm-device-bridge.c @@ -18,11 +18,10 @@ * Copyright 2011 - 2015 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <stdlib.h> -#include "nm-default.h" #include "nm-device-bridge.h" #include "NetworkManagerUtils.h" #include "nm-device-private.h" diff --git a/src/devices/nm-device-ethernet-utils.c b/src/devices/nm-device-ethernet-utils.c index 9165de31f..d034ddfc7 100644 --- a/src/devices/nm-device-ethernet-utils.c +++ b/src/devices/nm-device-ethernet-utils.c @@ -16,12 +16,12 @@ * (C) Copyright 2011 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include <nm-connection.h> -#include "nm-default.h" +#include "nm-connection.h" + #include "nm-device-ethernet-utils.h" char * diff --git a/src/devices/nm-device-ethernet.c b/src/devices/nm-device-ethernet.c index 6f8718a55..5333aba4f 100644 --- a/src/devices/nm-device-ethernet.c +++ b/src/devices/nm-device-ethernet.c @@ -19,7 +19,7 @@ * Copyright (C) 2006 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <netinet/in.h> #include <string.h> @@ -29,7 +29,6 @@ #include <gudev/gudev.h> -#include "nm-default.h" #include "nm-device-ethernet.h" #include "nm-device-private.h" #include "nm-activation-request.h" diff --git a/src/devices/nm-device-factory.c b/src/devices/nm-device-factory.c index 1af07d406..bd0ec002e 100644 --- a/src/devices/nm-device-factory.c +++ b/src/devices/nm-device-factory.c @@ -18,16 +18,14 @@ * Copyright (C) 2014 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <sys/types.h> #include <sys/stat.h> #include <errno.h> #include <string.h> - #include <gmodule.h> #include "nm-device-factory.h" -#include "nm-default.h" #include "nm-platform.h" #include "nm-utils.h" diff --git a/src/devices/nm-device-generic.c b/src/devices/nm-device-generic.c index 9f3fa90dc..d90840d27 100644 --- a/src/devices/nm-device-generic.c +++ b/src/devices/nm-device-generic.c @@ -18,7 +18,7 @@ * Copyright 2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include "nm-device-generic.h" #include "nm-device-private.h" diff --git a/src/devices/nm-device-infiniband.c b/src/devices/nm-device-infiniband.c index a2a686e33..79bcb57c9 100644 --- a/src/devices/nm-device-infiniband.c +++ b/src/devices/nm-device-infiniband.c @@ -18,11 +18,10 @@ * Copyright 2011 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <linux/if_infiniband.h> -#include "nm-default.h" #include "nm-device-infiniband.h" #include "NetworkManagerUtils.h" #include "nm-device-private.h" diff --git a/src/devices/nm-device-ip-tunnel.c b/src/devices/nm-device-ip-tunnel.c index 47e5ab615..0ba813eb5 100644 --- a/src/devices/nm-device-ip-tunnel.c +++ b/src/devices/nm-device-ip-tunnel.c @@ -18,7 +18,7 @@ * Copyright 2015 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <netinet/in.h> @@ -28,7 +28,6 @@ #include "nm-device-ip-tunnel.h" #include "nm-device-private.h" -#include "nm-default.h" #include "nm-manager.h" #include "nm-platform.h" #include "nm-device-factory.h" diff --git a/src/devices/nm-device-macvlan.c b/src/devices/nm-device-macvlan.c index 4560dd925..dfb0431b0 100644 --- a/src/devices/nm-device-macvlan.c +++ b/src/devices/nm-device-macvlan.c @@ -18,11 +18,10 @@ * Copyright 2013 - 2015 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include "nm-default.h" #include "nm-device-macvlan.h" #include "nm-device-private.h" #include "nm-connection-provider.h" diff --git a/src/devices/nm-device-tun.c b/src/devices/nm-device-tun.c index 863ee2eff..fdb72e453 100644 --- a/src/devices/nm-device-tun.c +++ b/src/devices/nm-device-tun.c @@ -18,13 +18,12 @@ * Copyright 2013 - 2015 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <stdlib.h> #include <string.h> #include <sys/types.h> -#include "nm-default.h" #include "nm-activation-request.h" #include "nm-device-tun.h" #include "nm-device-private.h" diff --git a/src/devices/nm-device-veth.c b/src/devices/nm-device-veth.c index a1bf0d219..3b845642b 100644 --- a/src/devices/nm-device-veth.c +++ b/src/devices/nm-device-veth.c @@ -18,7 +18,7 @@ * Copyright 2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <errno.h> #include <stdlib.h> @@ -29,7 +29,6 @@ #include "nm-device-veth.h" #include "nm-device-private.h" -#include "nm-default.h" #include "nm-manager.h" #include "nm-platform.h" #include "nm-device-factory.h" diff --git a/src/devices/nm-device-vlan.c b/src/devices/nm-device-vlan.c index fab48d736..5685b24e7 100644 --- a/src/devices/nm-device-vlan.c +++ b/src/devices/nm-device-vlan.c @@ -18,11 +18,10 @@ * Copyright 2011 - 2012 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <sys/socket.h> -#include "nm-default.h" #include "nm-device-vlan.h" #include "nm-manager.h" #include "nm-utils.h" diff --git a/src/devices/nm-device-vxlan.c b/src/devices/nm-device-vxlan.c index 9317ef5be..ff0f23436 100644 --- a/src/devices/nm-device-vxlan.c +++ b/src/devices/nm-device-vxlan.c @@ -18,11 +18,10 @@ * Copyright 2013 - 2015 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include "nm-default.h" #include "nm-device-vxlan.h" #include "nm-device-private.h" #include "nm-manager.h" diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 9b0cdfe9d..c9451e023 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -19,7 +19,7 @@ * Copyright (C) 2006 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <netinet/in.h> #include <string.h> @@ -34,7 +34,6 @@ #include <netlink/route/addr.h> #include <linux/if_addr.h> -#include "nm-default.h" #include "nm-device.h" #include "nm-device-private.h" #include "NetworkManagerUtils.h" diff --git a/src/devices/nm-lldp-listener.c b/src/devices/nm-lldp-listener.c index 911812925..767851bdd 100644 --- a/src/devices/nm-lldp-listener.c +++ b/src/devices/nm-lldp-listener.c @@ -18,7 +18,7 @@ * Copyright (C) 2015 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <net/ethernet.h> diff --git a/src/devices/team/nm-device-team.c b/src/devices/team/nm-device-team.c index 2258d99d3..c3d48b41e 100644 --- a/src/devices/team/nm-device-team.c +++ b/src/devices/team/nm-device-team.c @@ -18,7 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "config.h" +#include "nm-default.h" #include <sys/types.h> #include <unistd.h> @@ -27,7 +27,6 @@ #include <teamdctl.h> #include <stdlib.h> -#include "nm-default.h" #include "nm-device-team.h" #include "NetworkManagerUtils.h" #include "nm-device-private.h" diff --git a/src/devices/team/nm-team-factory.c b/src/devices/team/nm-team-factory.c index 5f9e142ad..971efe872 100644 --- a/src/devices/team/nm-team-factory.c +++ b/src/devices/team/nm-team-factory.c @@ -18,7 +18,7 @@ * Copyright (C) 2014 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <gmodule.h> @@ -26,7 +26,6 @@ #include "nm-device-factory.h" #include "nm-team-factory.h" #include "nm-device-team.h" -#include "nm-default.h" #include "nm-platform.h" #include "nm-core-internal.h" diff --git a/src/devices/tests/test-arping.c b/src/devices/tests/test-arping.c index cf70b1480..36e176310 100644 --- a/src/devices/tests/test-arping.c +++ b/src/devices/tests/test-arping.c @@ -18,9 +18,8 @@ * Copyright (C) 2015 Red Hat, Inc. */ -#include "config.h" - #include "nm-default.h" + #include "nm-arping-manager.h" #include "test-common.h" diff --git a/src/devices/tests/test-lldp.c b/src/devices/tests/test-lldp.c index c339d9ca4..7ec0d34e1 100644 --- a/src/devices/tests/test-lldp.c +++ b/src/devices/tests/test-lldp.c @@ -18,7 +18,7 @@ * Copyright (C) 2015 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <fcntl.h> #include <linux/if_tun.h> @@ -26,7 +26,6 @@ #include <sys/stat.h> #include <sys/types.h> -#include "nm-default.h" #include "nm-lldp-listener.h" #include "test-common.h" diff --git a/src/devices/wifi/nm-device-olpc-mesh.c b/src/devices/wifi/nm-device-olpc-mesh.c index 23ebd9c82..11da011ee 100644 --- a/src/devices/wifi/nm-device-olpc-mesh.c +++ b/src/devices/wifi/nm-device-olpc-mesh.c @@ -24,7 +24,7 @@ * (C) Copyright 2009 One Laptop per Child */ -#include "config.h" +#include "nm-default.h" #include <netinet/in.h> #include <string.h> @@ -35,7 +35,6 @@ #include <sys/ioctl.h> #include <errno.h> -#include "nm-default.h" #include "nm-device.h" #include "nm-device-wifi.h" #include "nm-device-olpc-mesh.h" diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c index e4640786b..18bbfcbf7 100644 --- a/src/devices/wifi/nm-device-wifi.c +++ b/src/devices/wifi/nm-device-wifi.c @@ -19,14 +19,13 @@ * Copyright (C) 2006 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <netinet/in.h> #include <string.h> #include <unistd.h> #include <errno.h> -#include "nm-default.h" #include "nm-device.h" #include "nm-device-wifi.h" #include "nm-device-private.h" diff --git a/src/devices/wifi/nm-wifi-ap-utils.c b/src/devices/wifi/nm-wifi-ap-utils.c index fe4b60ac8..bcf439daa 100644 --- a/src/devices/wifi/nm-wifi-ap-utils.c +++ b/src/devices/wifi/nm-wifi-ap-utils.c @@ -18,12 +18,11 @@ * (C) Copyright 2011 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <stdlib.h> -#include "nm-default.h" #include "nm-wifi-ap-utils.h" #include "nm-utils.h" diff --git a/src/devices/wifi/nm-wifi-ap.c b/src/devices/wifi/nm-wifi-ap.c index 771d67041..307825c6f 100644 --- a/src/devices/wifi/nm-wifi-ap.c +++ b/src/devices/wifi/nm-wifi-ap.c @@ -19,12 +19,11 @@ * Copyright (C) 2006 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <stdlib.h> -#include "nm-default.h" #include "nm-wifi-ap.h" #include "nm-wifi-ap-utils.h" #include "NetworkManagerUtils.h" diff --git a/src/devices/wifi/nm-wifi-factory.c b/src/devices/wifi/nm-wifi-factory.c index 7f56dc744..1c8ca47b5 100644 --- a/src/devices/wifi/nm-wifi-factory.c +++ b/src/devices/wifi/nm-wifi-factory.c @@ -18,7 +18,7 @@ * Copyright (C) 2011 - 2014 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <gmodule.h> diff --git a/src/devices/wifi/tests/test-wifi-ap-utils.c b/src/devices/wifi/tests/test-wifi-ap-utils.c index b5642fe2c..70e80ae9b 100644 --- a/src/devices/wifi/tests/test-wifi-ap-utils.c +++ b/src/devices/wifi/tests/test-wifi-ap-utils.c @@ -18,11 +18,10 @@ * */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include "nm-default.h" #include "nm-wifi-ap-utils.h" #include "nm-core-internal.h" diff --git a/src/devices/wwan/nm-device-modem.c b/src/devices/wwan/nm-device-modem.c index edecd24d8..e9c4f02e2 100644 --- a/src/devices/wwan/nm-device-modem.c +++ b/src/devices/wwan/nm-device-modem.c @@ -18,11 +18,10 @@ * Copyright (C) 2009 - 2011 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include "nm-default.h" #include "nm-device-modem.h" #include "nm-modem.h" #include "nm-device-private.h" diff --git a/src/devices/wwan/nm-modem-broadband.c b/src/devices/wwan/nm-modem-broadband.c index 44ac10215..6343416cb 100644 --- a/src/devices/wwan/nm-modem-broadband.c +++ b/src/devices/wwan/nm-modem-broadband.c @@ -18,7 +18,7 @@ * Copyright (C) 2012 Aleksander Morgado <aleksander@gnu.org> */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <arpa/inet.h> @@ -26,7 +26,6 @@ #include "nm-modem-broadband.h" #include "nm-core-internal.h" -#include "nm-default.h" #include "NetworkManagerUtils.h" #include "nm-device-private.h" #include "nm-platform.h" diff --git a/src/devices/wwan/nm-modem-manager.c b/src/devices/wwan/nm-modem-manager.c index c28d86adc..79082c410 100644 --- a/src/devices/wwan/nm-modem-manager.c +++ b/src/devices/wwan/nm-modem-manager.c @@ -20,14 +20,13 @@ * Copyright (C) 2009 Canonical Ltd. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <libmm-glib.h> #include "nm-modem-manager.h" -#include "nm-default.h" #include "nm-dbus-compat.h" #include "nm-modem.h" #include "nm-modem-broadband.h" diff --git a/src/devices/wwan/nm-modem.c b/src/devices/wwan/nm-modem.c index 709a54f82..c1736ecf8 100644 --- a/src/devices/wwan/nm-modem.c +++ b/src/devices/wwan/nm-modem.c @@ -19,9 +19,8 @@ * Copyright (C) 2009 Novell, Inc. */ -#include "config.h" - #include "nm-default.h" + #include "nm-modem.h" #include <string.h> @@ -29,7 +28,6 @@ #include "nm-core-internal.h" #include "nm-platform.h" #include "nm-setting-connection.h" -#include "nm-default.h" #include "NetworkManagerUtils.h" #include "nm-device-private.h" #include "nm-modem-enum-types.h" diff --git a/src/devices/wwan/nm-wwan-factory.c b/src/devices/wwan/nm-wwan-factory.c index 2fd9e0bd9..805aea69c 100644 --- a/src/devices/wwan/nm-wwan-factory.c +++ b/src/devices/wwan/nm-wwan-factory.c @@ -18,7 +18,7 @@ * Copyright (C) 2014 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <gmodule.h> @@ -29,7 +29,6 @@ #include "nm-setting-cdma.h" #include "nm-modem-manager.h" #include "nm-device-modem.h" -#include "nm-default.h" #include "nm-platform.h" static GType nm_wwan_factory_get_type (void); diff --git a/src/dhcp-manager/nm-dhcp-client.c b/src/dhcp-manager/nm-dhcp-client.c index 34d7132a5..0aeb6118a 100644 --- a/src/dhcp-manager/nm-dhcp-client.c +++ b/src/dhcp-manager/nm-dhcp-client.c @@ -17,9 +17,8 @@ * */ -#include "config.h" - #include "nm-default.h" + #include "nm-dhcp-client.h" #include <string.h> diff --git a/src/dhcp-manager/nm-dhcp-dhclient-utils.c b/src/dhcp-manager/nm-dhcp-dhclient-utils.c index 6520f7b1d..bf2df1e03 100644 --- a/src/dhcp-manager/nm-dhcp-dhclient-utils.c +++ b/src/dhcp-manager/nm-dhcp-dhclient-utils.c @@ -17,9 +17,8 @@ * Copyright (C) 2011 Red Hat, Inc. */ -#include "config.h" - #include "nm-default.h" + #include "nm-dhcp-dhclient-utils.h" #include <string.h> diff --git a/src/dhcp-manager/nm-dhcp-dhclient.c b/src/dhcp-manager/nm-dhcp-dhclient.c index 972fb506f..bc4345fe6 100644 --- a/src/dhcp-manager/nm-dhcp-dhclient.c +++ b/src/dhcp-manager/nm-dhcp-dhclient.c @@ -24,6 +24,8 @@ #include <time.h> #undef _XOPEN_SOURCE +#include "nm-default.h" + #include <string.h> #include <stdlib.h> #include <errno.h> @@ -33,7 +35,6 @@ #include <arpa/inet.h> #include <ctype.h> -#include "nm-default.h" #include "nm-dhcp-dhclient.h" #include "nm-utils.h" #include "nm-dhcp-dhclient-utils.h" diff --git a/src/dhcp-manager/nm-dhcp-dhcpcd.c b/src/dhcp-manager/nm-dhcp-dhcpcd.c index ebbbb0812..8060cc6a7 100644 --- a/src/dhcp-manager/nm-dhcp-dhcpcd.c +++ b/src/dhcp-manager/nm-dhcp-dhcpcd.c @@ -21,7 +21,7 @@ */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <stdlib.h> @@ -31,7 +31,6 @@ #include <netinet/in.h> #include <arpa/inet.h> -#include "nm-default.h" #include "nm-dhcp-dhcpcd.h" #include "nm-dhcp-manager.h" #include "nm-utils.h" diff --git a/src/dhcp-manager/nm-dhcp-helper.c b/src/dhcp-manager/nm-dhcp-helper.c index 15b63d94d..7667084d7 100644 --- a/src/dhcp-manager/nm-dhcp-helper.c +++ b/src/dhcp-manager/nm-dhcp-helper.c @@ -18,15 +18,13 @@ * Copyright (C) 2007 - 2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <unistd.h> #include <stdlib.h> #include <string.h> #include <signal.h> -#include "nm-default.h" - #define NM_DHCP_CLIENT_DBUS_IFACE "org.freedesktop.nm_dhcp_client" static const char * ignore[] = {"PATH", "SHLVL", "_", "PWD", "dhc_dbus", NULL}; diff --git a/src/dhcp-manager/nm-dhcp-listener.c b/src/dhcp-manager/nm-dhcp-listener.c index f6fafb808..595b20974 100644 --- a/src/dhcp-manager/nm-dhcp-listener.c +++ b/src/dhcp-manager/nm-dhcp-listener.c @@ -17,7 +17,7 @@ * */ -#include "config.h" +#include "nm-default.h" #include <sys/socket.h> #include <sys/wait.h> @@ -27,7 +27,6 @@ #include <errno.h> #include <unistd.h> -#include "nm-default.h" #include "nm-dhcp-listener.h" #include "nm-core-internal.h" #include "nm-bus-manager.h" diff --git a/src/dhcp-manager/nm-dhcp-manager.c b/src/dhcp-manager/nm-dhcp-manager.c index cb74a5bcc..44c3365d2 100644 --- a/src/dhcp-manager/nm-dhcp-manager.c +++ b/src/dhcp-manager/nm-dhcp-manager.c @@ -20,7 +20,7 @@ * */ -#include "config.h" +#include "nm-default.h" #include <sys/socket.h> #include <sys/wait.h> @@ -32,7 +32,6 @@ #include <fcntl.h> #include <stdio.h> -#include "nm-default.h" #include "nm-dhcp-manager.h" #include "nm-dhcp-dhclient.h" #include "nm-dhcp-dhcpcd.h" diff --git a/src/dhcp-manager/nm-dhcp-systemd.c b/src/dhcp-manager/nm-dhcp-systemd.c index 3a6de91b2..7c2bc78f5 100644 --- a/src/dhcp-manager/nm-dhcp-systemd.c +++ b/src/dhcp-manager/nm-dhcp-systemd.c @@ -16,7 +16,7 @@ * Copyright (C) 2014 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <stdlib.h> @@ -28,7 +28,6 @@ #include <ctype.h> #include <net/if_arp.h> -#include "nm-default.h" #include "nm-dhcp-systemd.h" #include "nm-utils.h" #include "nm-dhcp-utils.h" diff --git a/src/dhcp-manager/nm-dhcp-utils.c b/src/dhcp-manager/nm-dhcp-utils.c index 591a0d1f9..be563a697 100644 --- a/src/dhcp-manager/nm-dhcp-utils.c +++ b/src/dhcp-manager/nm-dhcp-utils.c @@ -17,14 +17,13 @@ * */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <errno.h> #include <unistd.h> #include <arpa/inet.h> -#include "nm-default.h" #include "nm-dhcp-utils.h" #include "nm-utils.h" #include "NetworkManagerUtils.h" diff --git a/src/dhcp-manager/tests/test-dhcp-dhclient.c b/src/dhcp-manager/tests/test-dhcp-dhclient.c index 04a15af48..0561d43c1 100644 --- a/src/dhcp-manager/tests/test-dhcp-dhclient.c +++ b/src/dhcp-manager/tests/test-dhcp-dhclient.c @@ -18,8 +18,6 @@ * */ -#include "config.h" - #include "nm-default.h" #include <string.h> diff --git a/src/dhcp-manager/tests/test-dhcp-utils.c b/src/dhcp-manager/tests/test-dhcp-utils.c index 49987c40c..380513268 100644 --- a/src/dhcp-manager/tests/test-dhcp-utils.c +++ b/src/dhcp-manager/tests/test-dhcp-utils.c @@ -17,15 +17,14 @@ * */ -#include "config.h" +#include "nm-default.h" #include <netinet/in.h> #include <arpa/inet.h> #include <string.h> -#include <nm-utils.h> +#include "nm-utils.h" -#include "nm-default.h" #include "nm-dhcp-utils.h" #include "nm-platform.h" diff --git a/src/dns-manager/nm-dns-dnsmasq.c b/src/dns-manager/nm-dns-dnsmasq.c index 75076ff02..8663dfd81 100644 --- a/src/dns-manager/nm-dns-dnsmasq.c +++ b/src/dns-manager/nm-dns-dnsmasq.c @@ -18,7 +18,7 @@ * */ -#include "config.h" +#include "nm-default.h" #include <stdlib.h> #include <unistd.h> @@ -27,7 +27,6 @@ #include <arpa/inet.h> #include <sys/stat.h> -#include "nm-default.h" #include "nm-dns-dnsmasq.h" #include "nm-utils.h" #include "nm-ip4-config.h" diff --git a/src/dns-manager/nm-dns-manager.c b/src/dns-manager/nm-dns-manager.c index b785e1450..79d345bed 100644 --- a/src/dns-manager/nm-dns-manager.c +++ b/src/dns-manager/nm-dns-manager.c @@ -21,7 +21,7 @@ * and others */ -#include "config.h" +#include "nm-default.h" #include <errno.h> #include <fcntl.h> @@ -35,7 +35,6 @@ #include <linux/fs.h> -#include "nm-default.h" #include "nm-utils.h" #include "nm-core-internal.h" #include "nm-dns-manager.h" diff --git a/src/dns-manager/nm-dns-plugin.c b/src/dns-manager/nm-dns-plugin.c index d473b9deb..8313ed13c 100644 --- a/src/dns-manager/nm-dns-plugin.c +++ b/src/dns-manager/nm-dns-plugin.c @@ -17,7 +17,7 @@ * */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <stdlib.h> @@ -25,7 +25,6 @@ #include <sys/types.h> #include <sys/wait.h> -#include "nm-default.h" #include "nm-dns-plugin.h" #include "NetworkManagerUtils.h" diff --git a/src/dns-manager/nm-dns-unbound.c b/src/dns-manager/nm-dns-unbound.c index d36e3f857..4c1af1039 100644 --- a/src/dns-manager/nm-dns-unbound.c +++ b/src/dns-manager/nm-dns-unbound.c @@ -17,7 +17,7 @@ * Copyright (C) 2014 Red Hat, Inc. * Author: Pavel Šimerda <psimerda@redhat.com> */ -#include "config.h" +#include "nm-default.h" #include "nm-dns-unbound.h" #include "NetworkManagerUtils.h" diff --git a/src/dns-manager/nm-dns-utils.c b/src/dns-manager/nm-dns-utils.c index 4a5255a42..e920611ac 100644 --- a/src/dns-manager/nm-dns-utils.c +++ b/src/dns-manager/nm-dns-utils.c @@ -17,7 +17,7 @@ * */ -#include "config.h" +#include "nm-default.h" #include <arpa/inet.h> #include <string.h> diff --git a/src/dnsmasq-manager/nm-dnsmasq-manager.c b/src/dnsmasq-manager/nm-dnsmasq-manager.c index 41184910d..9e388acfb 100644 --- a/src/dnsmasq-manager/nm-dnsmasq-manager.c +++ b/src/dnsmasq-manager/nm-dnsmasq-manager.c @@ -18,7 +18,7 @@ * Copyright (C) 2008 - 2012 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <sys/types.h> #include <sys/wait.h> @@ -28,7 +28,6 @@ #include <arpa/inet.h> #include <stdlib.h> -#include "nm-default.h" #include "nm-dnsmasq-manager.h" #include "nm-dnsmasq-utils.h" #include "nm-utils.h" diff --git a/src/dnsmasq-manager/nm-dnsmasq-utils.c b/src/dnsmasq-manager/nm-dnsmasq-utils.c index 4394ae7b5..bf8faecd5 100644 --- a/src/dnsmasq-manager/nm-dnsmasq-utils.c +++ b/src/dnsmasq-manager/nm-dnsmasq-utils.c @@ -18,7 +18,7 @@ * Copyright (C) 2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <arpa/inet.h> diff --git a/src/dnsmasq-manager/tests/test-dnsmasq-utils.c b/src/dnsmasq-manager/tests/test-dnsmasq-utils.c index 04bf1b4d7..850ae4f6f 100644 --- a/src/dnsmasq-manager/tests/test-dnsmasq-utils.c +++ b/src/dnsmasq-manager/tests/test-dnsmasq-utils.c @@ -18,11 +18,10 @@ * */ -#include "config.h" +#include "nm-default.h" #include <arpa/inet.h> -#include "nm-default.h" #include "nm-dnsmasq-utils.h" #include "nm-test-utils.h" diff --git a/src/main-utils.c b/src/main-utils.c index 7425d0bc9..e0f254b75 100644 --- a/src/main-utils.c +++ b/src/main-utils.c @@ -19,7 +19,7 @@ * Copyright (C) 2005 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <stdio.h> #include <errno.h> @@ -32,7 +32,6 @@ #include <glib-unix.h> #include <gmodule.h> -#include "nm-default.h" #include "main-utils.h" #include "NetworkManagerUtils.h" diff --git a/src/main.c b/src/main.c index ee8e0f2d4..12baed1fd 100644 --- a/src/main.c +++ b/src/main.c @@ -19,7 +19,7 @@ * Copyright (C) 2005 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <getopt.h> #include <locale.h> @@ -35,7 +35,6 @@ #include <string.h> #include <sys/resource.h> -#include "nm-default.h" #include "nm-dbus-interface.h" #include "NetworkManagerUtils.h" #include "main-utils.h" diff --git a/src/nm-activation-request.c b/src/nm-activation-request.c index 04a39dba8..17b1d75dc 100644 --- a/src/nm-activation-request.c +++ b/src/nm-activation-request.c @@ -19,16 +19,14 @@ * Copyright (C) 2007 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <stdlib.h> #include <sys/wait.h> #include <unistd.h> - #include "nm-activation-request.h" -#include "nm-default.h" #include "nm-setting-wireless-security.h" #include "nm-setting-8021x.h" #include "nm-device.h" diff --git a/src/nm-active-connection.c b/src/nm-active-connection.c index f7506022a..f275b3ef7 100644 --- a/src/nm-active-connection.c +++ b/src/nm-active-connection.c @@ -18,9 +18,8 @@ * Copyright (C) 2008 - 2014 Red Hat, Inc. */ -#include "config.h" - #include "nm-default.h" + #include "nm-active-connection.h" #include "nm-dbus-interface.h" #include "nm-device.h" diff --git a/src/nm-audit-manager.c b/src/nm-audit-manager.c index c1bbc2732..b4cfb20b6 100644 --- a/src/nm-audit-manager.c +++ b/src/nm-audit-manager.c @@ -18,9 +18,8 @@ * Copyright 2015 Red Hat, Inc. */ -#include "config.h" - #include "nm-default.h" + #include "nm-audit-manager.h" #include <errno.h> diff --git a/src/nm-auth-manager.c b/src/nm-auth-manager.c index bc519eb19..e2e22aca2 100644 --- a/src/nm-auth-manager.c +++ b/src/nm-auth-manager.c @@ -18,11 +18,10 @@ * Copyright (C) 2014 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include "nm-auth-manager.h" -#include "nm-default.h" #include "nm-errors.h" #include "nm-core-internal.h" #include "NetworkManagerUtils.h" diff --git a/src/nm-auth-subject.c b/src/nm-auth-subject.c index c4b6e579a..494d52d3e 100644 --- a/src/nm-auth-subject.c +++ b/src/nm-auth-subject.c @@ -26,14 +26,13 @@ * makes requests, like process identifier and user UID. */ -#include "config.h" +#include "nm-default.h" #include "nm-auth-subject.h" #include <string.h> #include <stdlib.h> -#include "nm-default.h" #include "nm-bus-manager.h" #include "nm-enum-types.h" #include "NetworkManagerUtils.h" diff --git a/src/nm-auth-subject.h b/src/nm-auth-subject.h index 1682ba7f1..5f5070581 100644 --- a/src/nm-auth-subject.h +++ b/src/nm-auth-subject.h @@ -21,10 +21,6 @@ #ifndef __NETWORKMANAGER_AUTH_SUBJECT_H__ #define __NETWORKMANAGER_AUTH_SUBJECT_H__ -#include "config.h" - -#include "nm-default.h" - #define NM_TYPE_AUTH_SUBJECT (nm_auth_subject_get_type ()) #define NM_AUTH_SUBJECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_AUTH_SUBJECT, NMAuthSubject)) #define NM_AUTH_SUBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_AUTH_SUBJECT, NMAuthSubjectClass)) diff --git a/src/nm-auth-utils.c b/src/nm-auth-utils.c index 8c1c4dac4..e741546bb 100644 --- a/src/nm-auth-utils.c +++ b/src/nm-auth-utils.c @@ -18,11 +18,10 @@ * Copyright (C) 2010 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include "nm-default.h" #include "nm-setting-connection.h" #include "nm-auth-utils.h" #include "nm-auth-subject.h" diff --git a/src/nm-bus-manager.c b/src/nm-bus-manager.c index a82b38836..b6245b246 100644 --- a/src/nm-bus-manager.c +++ b/src/nm-bus-manager.c @@ -19,7 +19,7 @@ * Copyright (C) 2006 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <unistd.h> #include <sys/stat.h> @@ -27,7 +27,6 @@ #include <errno.h> #include <string.h> -#include "nm-default.h" #include "nm-dbus-interface.h" #include "nm-bus-manager.h" #include "nm-core-internal.h" diff --git a/src/nm-bus-manager.h b/src/nm-bus-manager.h index 8e72a3ce9..49579d462 100644 --- a/src/nm-bus-manager.h +++ b/src/nm-bus-manager.h @@ -22,10 +22,6 @@ #ifndef __NM_BUS_MANAGER_H__ #define __NM_BUS_MANAGER_H__ -#include "config.h" - -#include "nm-default.h" - G_BEGIN_DECLS #define NM_TYPE_BUS_MANAGER (nm_bus_manager_get_type ()) @@ -33,7 +29,7 @@ G_BEGIN_DECLS #define NM_BUS_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), NM_TYPE_BUS_MANAGER, NMBusManagerClass)) #define NM_IS_BUS_MANAGER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), NM_TYPE_BUS_MANAGER)) #define NM_IS_BUS_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), NM_TYPE_BUS_MANAGER)) -#define NM_BUS_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), NM_TYPE_BUS_MANAGER, NMBusManagerClass)) +#define NM_BUS_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), NM_TYPE_BUS_MANAGER, NMBusManagerClass)) #define NM_BUS_MANAGER_DBUS_CONNECTION_CHANGED "dbus-connection-changed" #define NM_BUS_MANAGER_PRIVATE_CONNECTION_NEW "private-connection-new" diff --git a/src/nm-config-data.c b/src/nm-config-data.c index 1bbb5c96c..21f8f3ad3 100644 --- a/src/nm-config-data.c +++ b/src/nm-config-data.c @@ -19,9 +19,8 @@ * Copyright (C) 2013 Thomas Bechtold <thomasbechtold@jpberlin.de> */ -#include "config.h" - #include "nm-default.h" + #include "nm-config-data.h" #include <string.h> diff --git a/src/nm-config.c b/src/nm-config.c index 2eb27a988..58fd96cbf 100644 --- a/src/nm-config.c +++ b/src/nm-config.c @@ -19,12 +19,11 @@ * Copyright (C) 2013 Thomas Bechtold <thomasbechtold@jpberlin.de> */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <stdio.h> -#include "nm-default.h" #include "nm-config.h" #include "nm-utils.h" #include "nm-device.h" diff --git a/src/nm-connection-provider.c b/src/nm-connection-provider.c index 8185b8c60..2e258bd5b 100644 --- a/src/nm-connection-provider.c +++ b/src/nm-connection-provider.c @@ -13,7 +13,7 @@ * Copyright (C) 2012 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include "nm-connection-provider.h" #include "nm-utils.h" diff --git a/src/nm-connectivity.c b/src/nm-connectivity.c index a2216ee9a..934727fa9 100644 --- a/src/nm-connectivity.c +++ b/src/nm-connectivity.c @@ -19,14 +19,13 @@ * Copyright (C) 2011 Dan Williams <dcbw@redhat.com> */ -#include "config.h" +#include "nm-default.h" #include <string.h> #if WITH_CONCHECK #include <libsoup/soup.h> #endif -#include "nm-default.h" #include "nm-connectivity.h" #include "nm-config.h" #include "NetworkManagerUtils.h" diff --git a/src/nm-dcb.c b/src/nm-dcb.c index 109e56e54..d8f3d3e7e 100644 --- a/src/nm-dcb.c +++ b/src/nm-dcb.c @@ -18,12 +18,11 @@ * Copyright (C) 2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <sys/wait.h> #include <string.h> -#include "nm-default.h" #include "nm-dcb.h" #include "nm-platform.h" #include "NetworkManagerUtils.h" diff --git a/src/nm-default-route-manager.c b/src/nm-default-route-manager.c index a27cb287a..e2c4eefe4 100644 --- a/src/nm-default-route-manager.c +++ b/src/nm-default-route-manager.c @@ -19,11 +19,10 @@ */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include "nm-default.h" #include "nm-default-route-manager.h" #include "nm-device.h" #include "nm-vpn-connection.h" diff --git a/src/nm-dhcp4-config.c b/src/nm-dhcp4-config.c index 00b9949b3..26c6ab0b4 100644 --- a/src/nm-dhcp4-config.c +++ b/src/nm-dhcp4-config.c @@ -18,11 +18,10 @@ * Copyright (C) 2008 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include "nm-default.h" #include "nm-dbus-interface.h" #include "nm-dhcp4-config.h" #include "nm-utils.h" diff --git a/src/nm-dhcp6-config.c b/src/nm-dhcp6-config.c index 8aa8c2e07..4311ee985 100644 --- a/src/nm-dhcp6-config.c +++ b/src/nm-dhcp6-config.c @@ -18,11 +18,10 @@ * Copyright (C) 2008 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include "nm-default.h" #include "nm-dbus-interface.h" #include "nm-dhcp6-config.h" #include "nm-utils.h" diff --git a/src/nm-dispatcher.c b/src/nm-dispatcher.c index c226ce719..c0238fc59 100644 --- a/src/nm-dispatcher.c +++ b/src/nm-dispatcher.c @@ -19,12 +19,11 @@ * Copyright (C) 2005 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <errno.h> -#include "nm-default.h" #include "nm-dispatcher.h" #include "nm-dispatcher-api.h" #include "NetworkManagerUtils.h" diff --git a/src/nm-exported-object.c b/src/nm-exported-object.c index 8155bab0d..b6d30aaba 100644 --- a/src/nm-exported-object.c +++ b/src/nm-exported-object.c @@ -18,14 +18,13 @@ * Copyright 2014-2015 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <stdarg.h> #include <string.h> #include "nm-exported-object.h" #include "nm-bus-manager.h" -#include "nm-default.h" static GHashTable *prefix_counters; static gboolean quitting = FALSE; diff --git a/src/nm-firewall-manager.c b/src/nm-firewall-manager.c index 56b52c95e..7babff3ce 100644 --- a/src/nm-firewall-manager.c +++ b/src/nm-firewall-manager.c @@ -18,9 +18,8 @@ * Copyright (C) 2011 - 2015 Red Hat, Inc. */ -#include "config.h" - #include "nm-default.h" + #include "nm-firewall-manager.h" #include <string.h> diff --git a/src/nm-iface-helper.c b/src/nm-iface-helper.c index 069a68f82..fc3292ae8 100644 --- a/src/nm-iface-helper.c +++ b/src/nm-iface-helper.c @@ -18,7 +18,7 @@ * Copyright (C) 2014 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <glib-unix.h> #include <getopt.h> @@ -36,7 +36,6 @@ * Forward declare if_nametoindex. */ extern unsigned int if_nametoindex (const char *__ifname); -#include "nm-default.h" #include "NetworkManagerUtils.h" #include "nm-linux-platform.h" #include "nm-dhcp-manager.h" diff --git a/src/nm-ip4-config.c b/src/nm-ip4-config.c index 3973011ec..9c2557f93 100644 --- a/src/nm-ip4-config.c +++ b/src/nm-ip4-config.c @@ -19,9 +19,8 @@ * Copyright (C) 2006 - 2008 Novell, Inc. */ -#include "config.h" - #include "nm-default.h" + #include "nm-ip4-config.h" #include <string.h> diff --git a/src/nm-ip6-config.c b/src/nm-ip6-config.c index a7fc1155c..fa3541a3d 100644 --- a/src/nm-ip6-config.c +++ b/src/nm-ip6-config.c @@ -19,9 +19,8 @@ * Copyright (C) 2006 - 2008 Novell, Inc. */ -#include "config.h" - #include "nm-default.h" + #include "nm-ip6-config.h" #include <string.h> diff --git a/src/nm-logging.c b/src/nm-logging.c index 9d156db6a..c9006eb7a 100644 --- a/src/nm-logging.c +++ b/src/nm-logging.c @@ -19,7 +19,7 @@ * Copyright (C) 2006 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <dlfcn.h> #include <syslog.h> @@ -37,7 +37,6 @@ #include <systemd/sd-journal.h> #endif -#include "nm-default.h" #include "nm-errors.h" #include "NetworkManagerUtils.h" #include "nm-linux-platform.h" diff --git a/src/nm-manager.c b/src/nm-manager.c index 648faf4df..7f414e8fa 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -19,7 +19,7 @@ * Copyright (C) 2007 - 2012 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <stdlib.h> #include <fcntl.h> @@ -27,7 +27,6 @@ #include <string.h> #include <unistd.h> -#include "nm-default.h" #include "nm-manager.h" #include "nm-bus-manager.h" #include "nm-vpn-manager.h" diff --git a/src/nm-multi-index.c b/src/nm-multi-index.c index fe0c22558..6a2287533 100644 --- a/src/nm-multi-index.c +++ b/src/nm-multi-index.c @@ -18,9 +18,8 @@ * Copyright (C) 2015 Red Hat, Inc. */ -#include "config.h" - #include "nm-default.h" + #include "nm-multi-index.h" #include <string.h> diff --git a/src/nm-policy.c b/src/nm-policy.c index 05f7edf4d..68e50a1c1 100644 --- a/src/nm-policy.c +++ b/src/nm-policy.c @@ -19,15 +19,13 @@ * Copyright (C) 2007 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <unistd.h> #include <errno.h> #include <netdb.h> - -#include "nm-default.h" #include "nm-policy.h" #include "NetworkManagerUtils.h" #include "nm-activation-request.h" diff --git a/src/nm-rfkill-manager.c b/src/nm-rfkill-manager.c index 76703b20c..167426563 100644 --- a/src/nm-rfkill-manager.c +++ b/src/nm-rfkill-manager.c @@ -18,13 +18,12 @@ * Copyright (C) 2009 - 2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <gudev/gudev.h> #include "nm-rfkill-manager.h" -#include "nm-default.h" typedef struct { GUdevClient *client; diff --git a/src/nm-route-manager.c b/src/nm-route-manager.c index 3f43ceb65..84811d5ac 100644 --- a/src/nm-route-manager.c +++ b/src/nm-route-manager.c @@ -18,7 +18,7 @@ * Copyright (C) 2015 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> @@ -26,7 +26,6 @@ #include "nm-platform.h" #include "nmp-object.h" #include "nm-core-internal.h" -#include "nm-default.h" #include "NetworkManagerUtils.h" /* if within half a second after adding an IP address a matching device-route shows diff --git a/src/nm-session-monitor.c b/src/nm-session-monitor.c index 461195b00..d8b046e65 100644 --- a/src/nm-session-monitor.c +++ b/src/nm-session-monitor.c @@ -19,14 +19,13 @@ * Author: Matthias Clasen * Author: Pavel Šimerda <psimerda@redhat.com> */ -#include "config.h" +#include "nm-default.h" #include <pwd.h> #include <errno.h> #include <string.h> #include <sys/stat.h> -#include "nm-default.h" #include "nm-session-monitor.h" #include "NetworkManagerUtils.h" diff --git a/src/nm-sleep-monitor-systemd.c b/src/nm-sleep-monitor-systemd.c index 12db56b29..064a7035d 100644 --- a/src/nm-sleep-monitor-systemd.c +++ b/src/nm-sleep-monitor-systemd.c @@ -17,14 +17,13 @@ * Author: Matthias Clasen <mclasen@redhat.com> */ -#include "config.h" +#include "nm-default.h" #include <errno.h> #include <string.h> #include <sys/stat.h> #include <gio/gunixfdlist.h> -#include "nm-default.h" #include "nm-core-internal.h" #include "NetworkManagerUtils.h" diff --git a/src/nm-sleep-monitor-upower.c b/src/nm-sleep-monitor-upower.c index c65609cf4..5f0ff2455 100644 --- a/src/nm-sleep-monitor-upower.c +++ b/src/nm-sleep-monitor-upower.c @@ -17,12 +17,12 @@ * Author: Matthias Clasen <mclasen@redhat.com> */ -#include "config.h" +#include "nm-default.h" #include <errno.h> #include <string.h> #include <sys/stat.h> -#include "nm-default.h" + #include "nm-core-internal.h" #include "nm-sleep-monitor.h" diff --git a/src/platform/nm-fake-platform.c b/src/platform/nm-fake-platform.c index 7fef69658..99ba6acab 100644 --- a/src/platform/nm-fake-platform.c +++ b/src/platform/nm-fake-platform.c @@ -18,7 +18,7 @@ * Copyright (C) 2012–2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <errno.h> #include <unistd.h> @@ -30,7 +30,6 @@ #include "nmp-object.h" #include "NetworkManagerUtils.h" #include "nm-fake-platform.h" -#include "nm-default.h" #include "nm-test-utils.h" diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c index f2d87fc58..1ebffd000 100644 --- a/src/platform/nm-linux-platform.c +++ b/src/platform/nm-linux-platform.c @@ -17,7 +17,7 @@ * * Copyright (C) 2012-2015 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <errno.h> #include <unistd.h> @@ -48,7 +48,6 @@ #include "nm-platform-utils.h" #include "NetworkManagerUtils.h" #include "nm-utils.h" -#include "nm-default.h" #include "wifi/wifi-utils.h" #include "wifi/wifi-utils-wext.h" #include "nmp-object.h" diff --git a/src/platform/nm-platform-utils.h b/src/platform/nm-platform-utils.h index 9265ff242..a9d29c047 100644 --- a/src/platform/nm-platform-utils.h +++ b/src/platform/nm-platform-utils.h @@ -21,8 +21,6 @@ #ifndef __NM_PLATFORM_UTILS_H__ #define __NM_PLATFORM_UTILS_H__ -#include "config.h" - #include <gudev/gudev.h> #include "nm-platform.h" diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c index 24492af86..d4ba6ee4e 100644 --- a/src/platform/nm-platform.c +++ b/src/platform/nm-platform.c @@ -18,7 +18,7 @@ * Copyright (C) 2012 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <stdlib.h> #include <errno.h> @@ -38,7 +38,6 @@ #include "nm-platform-utils.h" #include "nmp-object.h" #include "NetworkManagerUtils.h" -#include "nm-default.h" #include "nm-enum-types.h" #include "nm-core-internal.h" diff --git a/src/platform/nmp-object.c b/src/platform/nmp-object.c index 892fd9dde..aa5d918c9 100644 --- a/src/platform/nmp-object.c +++ b/src/platform/nmp-object.c @@ -18,11 +18,10 @@ * Copyright (C) 2015 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <unistd.h> -#include "nm-default.h" #include "nmp-object.h" #include "nm-platform-utils.h" #include "NetworkManagerUtils.h" diff --git a/src/platform/tests/monitor.c b/src/platform/tests/monitor.c index 5cc3114cd..3af34be42 100644 --- a/src/platform/tests/monitor.c +++ b/src/platform/tests/monitor.c @@ -1,9 +1,28 @@ -#include "config.h" +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ +/* NetworkManager audit support + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Copyright 2015 Red Hat, Inc. + */ + +#include "nm-default.h" #include <stdlib.h> #include <syslog.h> -#include "nm-default.h" #include "nm-linux-platform.h" #include "nm-test-utils.h" diff --git a/src/platform/tests/test-address.c b/src/platform/tests/test-address.c index 681343377..3b52a7be7 100644 --- a/src/platform/tests/test-address.c +++ b/src/platform/tests/test-address.c @@ -1,4 +1,24 @@ -#include "config.h" +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ +/* NetworkManager audit support + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Copyright 2015 Red Hat, Inc. + */ + +#include "nm-default.h" #include "test-common.h" diff --git a/src/platform/tests/test-cleanup.c b/src/platform/tests/test-cleanup.c index 9e624a028..402546733 100644 --- a/src/platform/tests/test-cleanup.c +++ b/src/platform/tests/test-cleanup.c @@ -1,4 +1,24 @@ -#include "config.h" +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ +/* NetworkManager audit support + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Copyright 2016 Red Hat, Inc. + */ + +#include "nm-default.h" #include "test-common.h" diff --git a/src/platform/tests/test-common.c b/src/platform/tests/test-common.c index 67468539f..23ad7feae 100644 --- a/src/platform/tests/test-common.c +++ b/src/platform/tests/test-common.c @@ -1,4 +1,24 @@ -#include "config.h" +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ +/* NetworkManager audit support + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Copyright 2016 Red Hat, Inc. + */ + +#include "nm-default.h" #include <sys/mount.h> #include <sched.h> diff --git a/src/platform/tests/test-link.c b/src/platform/tests/test-link.c index 6e6e4418a..3fa5ad500 100644 --- a/src/platform/tests/test-link.c +++ b/src/platform/tests/test-link.c @@ -1,4 +1,24 @@ -#include "config.h" +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ +/* NetworkManager audit support + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Copyright 2016 Red Hat, Inc. + */ + +#include "nm-default.h" #include <sched.h> diff --git a/src/platform/tests/test-nmp-object.c b/src/platform/tests/test-nmp-object.c index f65ffc2dd..3b44abb8d 100644 --- a/src/platform/tests/test-nmp-object.c +++ b/src/platform/tests/test-nmp-object.c @@ -18,9 +18,8 @@ * Copyright (C) 2015 Red Hat, Inc. */ -#include "config.h" - #include "nm-default.h" + #include "nmp-object.h" #include "nm-test-utils.h" diff --git a/src/platform/tests/test-route.c b/src/platform/tests/test-route.c index 60a0c15c3..4e95773db 100644 --- a/src/platform/tests/test-route.c +++ b/src/platform/tests/test-route.c @@ -1,11 +1,32 @@ -#include "config.h" +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ +/* NetworkManager audit support + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Copyright 2016 Red Hat, Inc. + */ + +#include "nm-default.h" #include <linux/rtnetlink.h> #include "test-common.h" -#include "nm-test-utils.h" #include "NetworkManagerUtils.h" +#include "nm-test-utils.h" + #define DEVICE_NAME "nm-test-device" static void diff --git a/src/platform/wifi/wifi-utils-nl80211.c b/src/platform/wifi/wifi-utils-nl80211.c index e05104f37..79f217a8d 100644 --- a/src/platform/wifi/wifi-utils-nl80211.c +++ b/src/platform/wifi/wifi-utils-nl80211.c @@ -20,7 +20,7 @@ * Copyright (C) 2011 Intel Corporation. All rights reserved. */ -#include "config.h" +#include "nm-default.h" #include <errno.h> #include <string.h> @@ -32,7 +32,6 @@ #include <netlink/msg.h> #include <linux/nl80211.h> -#include "nm-default.h" #include "wifi-utils-private.h" #include "wifi-utils-nl80211.h" #include "nm-platform.h" diff --git a/src/platform/wifi/wifi-utils-wext.c b/src/platform/wifi/wifi-utils-wext.c index 85a387fae..029601e4b 100644 --- a/src/platform/wifi/wifi-utils-wext.c +++ b/src/platform/wifi/wifi-utils-wext.c @@ -19,7 +19,7 @@ * Copyright (C) 2006 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <errno.h> #include <string.h> @@ -28,8 +28,6 @@ #include <unistd.h> #include <math.h> - -#include "nm-default.h" #include "wifi-utils-private.h" #include "wifi-utils-wext.h" #include "nm-utils.h" diff --git a/src/platform/wifi/wifi-utils.c b/src/platform/wifi/wifi-utils.c index 5f2f61b0d..38e5a0545 100644 --- a/src/platform/wifi/wifi-utils.c +++ b/src/platform/wifi/wifi-utils.c @@ -19,13 +19,12 @@ * Copyright (C) 2006 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <sys/stat.h> #include <stdio.h> #include <string.h> -#include "nm-default.h" #include "wifi-utils.h" #include "wifi-utils-private.h" #include "wifi-utils-nl80211.h" diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c index 94e5f8c92..1578e595f 100644 --- a/src/ppp-manager/nm-ppp-manager.c +++ b/src/ppp-manager/nm-ppp-manager.c @@ -19,7 +19,7 @@ * Copyright (C) 2008 - 2012 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <sys/types.h> #include <sys/wait.h> @@ -42,7 +42,6 @@ #include <linux/if.h> #include <linux/if_ppp.h> -#include "nm-default.h" #include "NetworkManagerUtils.h" #include "nm-ppp-manager.h" #include "nm-platform.h" diff --git a/src/ppp-manager/nm-pppd-plugin.c b/src/ppp-manager/nm-pppd-plugin.c index 1f1016ae8..be4dd1855 100644 --- a/src/ppp-manager/nm-pppd-plugin.c +++ b/src/ppp-manager/nm-pppd-plugin.c @@ -20,6 +20,7 @@ */ #include "config.h" +#define ___CONFIG_H__ #include <string.h> #include <pppd/pppd.h> diff --git a/src/rdisc/nm-fake-rdisc.c b/src/rdisc/nm-fake-rdisc.c index 001fd9388..6a1585b31 100644 --- a/src/rdisc/nm-fake-rdisc.c +++ b/src/rdisc/nm-fake-rdisc.c @@ -18,7 +18,7 @@ * Copyright (C) 2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <arpa/inet.h> @@ -26,8 +26,6 @@ #include "nm-fake-rdisc.h" #include "nm-rdisc-private.h" -#include "nm-default.h" - #define _NMLOG_PREFIX_NAME "rdisc-fake" typedef struct { diff --git a/src/rdisc/nm-lndp-rdisc.c b/src/rdisc/nm-lndp-rdisc.c index 46000994b..068634621 100644 --- a/src/rdisc/nm-lndp-rdisc.c +++ b/src/rdisc/nm-lndp-rdisc.c @@ -18,7 +18,7 @@ * Copyright (C) 2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <arpa/inet.h> @@ -30,7 +30,6 @@ #include "nm-rdisc-private.h" #include "NetworkManagerUtils.h" -#include "nm-default.h" #include "nm-platform.h" #define _NMLOG_PREFIX_NAME "rdisc-lndp" diff --git a/src/rdisc/nm-rdisc.c b/src/rdisc/nm-rdisc.c index 6133ae282..82aece309 100644 --- a/src/rdisc/nm-rdisc.c +++ b/src/rdisc/nm-rdisc.c @@ -18,7 +18,7 @@ * Copyright (C) 2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <stdlib.h> #include <arpa/inet.h> @@ -27,7 +27,6 @@ #include "nm-rdisc.h" #include "nm-rdisc-private.h" -#include "nm-default.h" #include "nm-utils.h" #include <nm-setting-ip6-config.h> diff --git a/src/rdisc/tests/test-rdisc-fake.c b/src/rdisc/tests/test-rdisc-fake.c index ad045cff0..00a98dcad 100644 --- a/src/rdisc/tests/test-rdisc-fake.c +++ b/src/rdisc/tests/test-rdisc-fake.c @@ -18,14 +18,13 @@ * Copyright (C) 2015 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <syslog.h> #include "nm-rdisc.h" #include "nm-fake-rdisc.h" -#include "nm-default.h" #include "nm-fake-platform.h" diff --git a/src/rdisc/tests/test-rdisc-linux.c b/src/rdisc/tests/test-rdisc-linux.c index b93c50a77..bbdb5fb84 100644 --- a/src/rdisc/tests/test-rdisc-linux.c +++ b/src/rdisc/tests/test-rdisc-linux.c @@ -18,14 +18,13 @@ * Copyright (C) 2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <syslog.h> #include "nm-rdisc.h" #include "nm-lndp-rdisc.h" -#include "nm-default.h" #include "nm-linux-platform.h" diff --git a/src/settings/nm-agent-manager.c b/src/settings/nm-agent-manager.c index ee1c6202b..bc09e0316 100644 --- a/src/settings/nm-agent-manager.c +++ b/src/settings/nm-agent-manager.c @@ -18,12 +18,11 @@ * Copyright (C) 2010 - 2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <pwd.h> -#include "nm-default.h" #include "nm-dbus-interface.h" #include "nm-agent-manager.h" #include "nm-secret-agent.h" diff --git a/src/settings/nm-inotify-helper.c b/src/settings/nm-inotify-helper.c index 681933cd2..ce15246c5 100644 --- a/src/settings/nm-inotify-helper.c +++ b/src/settings/nm-inotify-helper.c @@ -18,14 +18,13 @@ * (C) Copyright 2008 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <unistd.h> #include <string.h> #include <sys/inotify.h> #include <errno.h> -#include "nm-default.h" #include "nm-inotify-helper.h" #include "NetworkManagerUtils.h" diff --git a/src/settings/nm-secret-agent.c b/src/settings/nm-secret-agent.c index 89e84c269..bfa7b5062 100644 --- a/src/settings/nm-secret-agent.c +++ b/src/settings/nm-secret-agent.c @@ -18,12 +18,11 @@ * Copyright (C) 2010 - 2011 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <sys/types.h> #include <pwd.h> -#include "nm-default.h" #include "nm-dbus-interface.h" #include "nm-secret-agent.h" #include "nm-bus-manager.h" diff --git a/src/settings/nm-settings-connection.c b/src/settings/nm-settings-connection.c index 287cb69a7..a1695b346 100644 --- a/src/settings/nm-settings-connection.c +++ b/src/settings/nm-settings-connection.c @@ -19,11 +19,10 @@ * Copyright 2008 - 2014 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include "nm-default.h" #include "nm-dbus-interface.h" #include "nm-settings-connection.h" #include "nm-session-monitor.h" diff --git a/src/settings/nm-settings-plugin.c b/src/settings/nm-settings-plugin.c index 0bce8957d..2023bc17d 100644 --- a/src/settings/nm-settings-plugin.c +++ b/src/settings/nm-settings-plugin.c @@ -19,7 +19,7 @@ * Copyright (C) 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include "nm-settings-plugin.h" #include "nm-settings-connection.h" diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c index 377d52793..ee48e7119 100644 --- a/src/settings/nm-settings.c +++ b/src/settings/nm-settings.c @@ -23,7 +23,7 @@ * (C) Copyright 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <unistd.h> #include <sys/stat.h> @@ -36,33 +36,32 @@ #include <selinux/selinux.h> #endif -#include <nm-dbus-interface.h> -#include <nm-connection.h> -#include <nm-setting-8021x.h> -#include <nm-setting-bluetooth.h> -#include <nm-setting-cdma.h> -#include <nm-setting-connection.h> -#include <nm-setting-gsm.h> -#include <nm-setting-ip4-config.h> -#include <nm-setting-ip6-config.h> -#include <nm-setting-olpc-mesh.h> -#include <nm-setting-ppp.h> -#include <nm-setting-pppoe.h> -#include <nm-setting-serial.h> -#include <nm-setting-vpn.h> -#include <nm-setting-wired.h> -#include <nm-setting-adsl.h> -#include <nm-setting-wireless.h> -#include <nm-setting-wireless-security.h> -#include <nm-setting-bond.h> -#include <nm-utils.h> +#include "nm-dbus-interface.h" +#include "nm-connection.h" +#include "nm-setting-8021x.h" +#include "nm-setting-bluetooth.h" +#include "nm-setting-cdma.h" +#include "nm-setting-connection.h" +#include "nm-setting-gsm.h" +#include "nm-setting-ip4-config.h" +#include "nm-setting-ip6-config.h" +#include "nm-setting-olpc-mesh.h" +#include "nm-setting-ppp.h" +#include "nm-setting-pppoe.h" +#include "nm-setting-serial.h" +#include "nm-setting-vpn.h" +#include "nm-setting-wired.h" +#include "nm-setting-adsl.h" +#include "nm-setting-wireless.h" +#include "nm-setting-wireless-security.h" +#include "nm-setting-bond.h" +#include "nm-utils.h" #include "nm-core-internal.h" #include "nm-device-ethernet.h" #include "nm-settings.h" #include "nm-settings-connection.h" #include "nm-settings-plugin.h" -#include "nm-default.h" #include "nm-bus-manager.h" #include "nm-auth-utils.h" #include "nm-auth-subject.h" diff --git a/src/settings/plugins/ibft/nm-ibft-connection.c b/src/settings/plugins/ibft/nm-ibft-connection.c index c6a9054e4..95495b5ca 100644 --- a/src/settings/plugins/ibft/nm-ibft-connection.c +++ b/src/settings/plugins/ibft/nm-ibft-connection.c @@ -18,7 +18,7 @@ * Copyright 2014 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <net/ethernet.h> diff --git a/src/settings/plugins/ibft/plugin.c b/src/settings/plugins/ibft/plugin.c index 555725d1a..6f9b8c82c 100644 --- a/src/settings/plugins/ibft/plugin.c +++ b/src/settings/plugins/ibft/plugin.c @@ -18,7 +18,7 @@ * Copyright 2014 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <unistd.h> @@ -26,9 +26,8 @@ #include <gmodule.h> -#include <nm-setting-connection.h> +#include "nm-setting-connection.h" -#include "nm-default.h" #include "nm-settings-plugin.h" #include "NetworkManagerUtils.h" diff --git a/src/settings/plugins/ibft/reader.c b/src/settings/plugins/ibft/reader.c index bd21a571b..c39d875cf 100644 --- a/src/settings/plugins/ibft/reader.c +++ b/src/settings/plugins/ibft/reader.c @@ -18,7 +18,7 @@ * Copyright 2014 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <stdlib.h> #include <string.h> @@ -31,7 +31,6 @@ #include <sys/ioctl.h> #include <unistd.h> -#include "nm-default.h" #include "nm-core-internal.h" #include "nm-platform.h" #include "NetworkManagerUtils.h" diff --git a/src/settings/plugins/ibft/tests/test-ibft.c b/src/settings/plugins/ibft/tests/test-ibft.c index c7aef050d..a9085478c 100644 --- a/src/settings/plugins/ibft/tests/test-ibft.c +++ b/src/settings/plugins/ibft/tests/test-ibft.c @@ -18,7 +18,7 @@ * Copyright 2014 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <stdio.h> #include <stdarg.h> @@ -33,7 +33,6 @@ #include "NetworkManagerUtils.h" #include "reader.h" -#include "nm-default.h" #include "nm-test-utils.h" diff --git a/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c b/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c index 336d9d662..c524e0f9c 100644 --- a/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c +++ b/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c @@ -18,25 +18,23 @@ * Copyright (C) 2008 - 2011 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <glib/gstdio.h> -#include <nm-dbus-interface.h> -#include <nm-setting-connection.h> -#include <nm-setting-wired.h> -#include <nm-setting-wireless.h> -#include <nm-setting-gsm.h> -#include <nm-setting-cdma.h> -#include <nm-setting-pppoe.h> -#include <nm-setting-wireless-security.h> -#include <nm-setting-8021x.h> +#include "nm-dbus-interface.h" +#include "nm-setting-connection.h" +#include "nm-setting-wired.h" +#include "nm-setting-wireless.h" +#include "nm-setting-gsm.h" +#include "nm-setting-cdma.h" +#include "nm-setting-pppoe.h" +#include "nm-setting-wireless-security.h" +#include "nm-setting-8021x.h" #include "nm-platform.h" -#include "nm-default.h" - #include "common.h" #include "nm-config.h" #include "nm-ifcfg-connection.h" diff --git a/src/settings/plugins/ifcfg-rh/plugin.c b/src/settings/plugins/ifcfg-rh/plugin.c index 5afc46d60..d28e3bf6c 100644 --- a/src/settings/plugins/ifcfg-rh/plugin.c +++ b/src/settings/plugins/ifcfg-rh/plugin.c @@ -21,7 +21,7 @@ * Copyright (C) 2007 - 2011 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <unistd.h> @@ -33,7 +33,6 @@ #include "nm-setting-connection.h" -#include "nm-default.h" #include "common.h" #include "plugin.h" #include "nm-settings-plugin.h" diff --git a/src/settings/plugins/ifcfg-rh/reader.c b/src/settings/plugins/ifcfg-rh/reader.c index 0f79ca07a..5d4375cc0 100644 --- a/src/settings/plugins/ifcfg-rh/reader.c +++ b/src/settings/plugins/ifcfg-rh/reader.c @@ -18,7 +18,7 @@ * Copyright 2008 - 2015 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <stdlib.h> #include <string.h> @@ -31,25 +31,24 @@ #include <sys/ioctl.h> #include <unistd.h> -#include <nm-connection.h> -#include <nm-dbus-interface.h> -#include <nm-setting-connection.h> -#include <nm-setting-ip4-config.h> -#include <nm-setting-vlan.h> -#include <nm-setting-ip6-config.h> -#include <nm-setting-wired.h> -#include <nm-setting-wireless.h> -#include <nm-setting-8021x.h> -#include <nm-setting-bond.h> -#include <nm-setting-team.h> -#include <nm-setting-team-port.h> -#include <nm-setting-bridge.h> -#include <nm-setting-bridge-port.h> -#include <nm-setting-dcb.h> -#include <nm-setting-generic.h> -#include "nm-default.h" +#include "nm-connection.h" +#include "nm-dbus-interface.h" +#include "nm-setting-connection.h" +#include "nm-setting-ip4-config.h" +#include "nm-setting-vlan.h" +#include "nm-setting-ip6-config.h" +#include "nm-setting-wired.h" +#include "nm-setting-wireless.h" +#include "nm-setting-8021x.h" +#include "nm-setting-bond.h" +#include "nm-setting-team.h" +#include "nm-setting-team-port.h" +#include "nm-setting-bridge.h" +#include "nm-setting-bridge-port.h" +#include "nm-setting-dcb.h" +#include "nm-setting-generic.h" #include "nm-core-internal.h" -#include <nm-utils.h> +#include "nm-utils.h" #include "nm-platform.h" #include "NetworkManagerUtils.h" diff --git a/src/settings/plugins/ifcfg-rh/shvar.c b/src/settings/plugins/ifcfg-rh/shvar.c index 43068c670..4e756349c 100644 --- a/src/settings/plugins/ifcfg-rh/shvar.c +++ b/src/settings/plugins/ifcfg-rh/shvar.c @@ -23,7 +23,7 @@ * */ -#include "config.h" +#include "nm-default.h" #include <errno.h> #include <fcntl.h> @@ -37,7 +37,6 @@ #include "shvar.h" #include "nm-core-internal.h" -#include "nm-default.h" #define PARSE_WARNING(msg...) nm_log_warn (LOGD_SETTINGS, " " msg) diff --git a/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh-utils.c b/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh-utils.c index 1ce7e8fa0..5a0f6451a 100644 --- a/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh-utils.c +++ b/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh-utils.c @@ -18,7 +18,7 @@ * Copyright (C) 2008 - 2011 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <stdio.h> #include <stdarg.h> diff --git a/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c b/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c index 30bffa733..658281f79 100644 --- a/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c +++ b/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c @@ -18,7 +18,7 @@ * Copyright (C) 2008 - 2011 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <stdio.h> #include <stdarg.h> @@ -30,22 +30,22 @@ #include <sys/types.h> #include <sys/stat.h> -#include <nm-utils.h> -#include <nm-setting-connection.h> -#include <nm-setting-wired.h> -#include <nm-setting-wireless.h> -#include <nm-setting-wireless-security.h> -#include <nm-setting-ip4-config.h> -#include <nm-setting-ip6-config.h> -#include <nm-setting-8021x.h> -#include <nm-setting-pppoe.h> -#include <nm-setting-ppp.h> -#include <nm-setting-vpn.h> -#include <nm-setting-gsm.h> -#include <nm-setting-cdma.h> -#include <nm-setting-serial.h> -#include <nm-setting-vlan.h> -#include <nm-setting-dcb.h> +#include "nm-utils.h" +#include "nm-setting-connection.h" +#include "nm-setting-wired.h" +#include "nm-setting-wireless.h" +#include "nm-setting-wireless-security.h" +#include "nm-setting-ip4-config.h" +#include "nm-setting-ip6-config.h" +#include "nm-setting-8021x.h" +#include "nm-setting-pppoe.h" +#include "nm-setting-ppp.h" +#include "nm-setting-vpn.h" +#include "nm-setting-gsm.h" +#include "nm-setting-cdma.h" +#include "nm-setting-serial.h" +#include "nm-setting-vlan.h" +#include "nm-setting-dcb.h" #include "nm-core-internal.h" #include "NetworkManagerUtils.h" @@ -54,7 +54,6 @@ #include "reader.h" #include "writer.h" #include "utils.h" -#include "nm-default.h" #include "nm-test-utils.h" diff --git a/src/settings/plugins/ifcfg-rh/utils.c b/src/settings/plugins/ifcfg-rh/utils.c index 40270104b..fda900b20 100644 --- a/src/settings/plugins/ifcfg-rh/utils.c +++ b/src/settings/plugins/ifcfg-rh/utils.c @@ -18,9 +18,8 @@ * (C) Copyright 2008 - 2012 Red Hat, Inc. */ -#include "config.h" - #include "nm-default.h" + #include "utils.h" #include <stdlib.h> diff --git a/src/settings/plugins/ifcfg-rh/writer.c b/src/settings/plugins/ifcfg-rh/writer.c index 73d1dc546..53e2f56b2 100644 --- a/src/settings/plugins/ifcfg-rh/writer.c +++ b/src/settings/plugins/ifcfg-rh/writer.c @@ -18,9 +18,8 @@ * Copyright 2009 - 2015 Red Hat, Inc. */ -#include "config.h" - #include "nm-default.h" + #include "writer.h" #include <string.h> diff --git a/src/settings/plugins/ifnet/connection_parser.c b/src/settings/plugins/ifnet/connection_parser.c index 51ff9da6a..bf8b9a429 100644 --- a/src/settings/plugins/ifnet/connection_parser.c +++ b/src/settings/plugins/ifnet/connection_parser.c @@ -19,7 +19,7 @@ * Copyright (C) 1999-2010 Gentoo Foundation, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <arpa/inet.h> @@ -27,7 +27,6 @@ #include <errno.h> #include "nm-settings-plugin.h" -#include "nm-default.h" #include "nm-core-internal.h" #include "NetworkManagerUtils.h" diff --git a/src/settings/plugins/ifnet/net_parser.c b/src/settings/plugins/ifnet/net_parser.c index ee66ff53d..cad34f068 100644 --- a/src/settings/plugins/ifnet/net_parser.c +++ b/src/settings/plugins/ifnet/net_parser.c @@ -19,15 +19,14 @@ * Copyright (C) 1999-2010 Gentoo Foundation, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <stdio.h> #include <sys/ioctl.h> #include <unistd.h> -#include <nm-settings-plugin.h> -#include "nm-default.h" +#include "nm-settings-plugin.h" #include "plugin.h" #include "nm-platform.h" diff --git a/src/settings/plugins/ifnet/net_utils.c b/src/settings/plugins/ifnet/net_utils.c index e61c65210..1944e4782 100644 --- a/src/settings/plugins/ifnet/net_utils.c +++ b/src/settings/plugins/ifnet/net_utils.c @@ -19,17 +19,17 @@ * Copyright (C) 1999-2010 Gentoo Foundation, Inc. */ -#include "config.h" +#include "nm-default.h" #include <stdlib.h> #include <stdio.h> #include <string.h> #include <errno.h> -#include <nm-utils.h> + +#include "nm-utils.h" #include "NetworkManagerUtils.h" -#include <nm-settings-plugin.h> +#include "nm-settings-plugin.h" #include "nm-config.h" -#include "nm-default.h" #include "net_utils.h" #include "wpa_parser.h" #include "net_parser.h" diff --git a/src/settings/plugins/ifnet/nm-ifnet-connection.c b/src/settings/plugins/ifnet/nm-ifnet-connection.c index 450fe9317..845155194 100644 --- a/src/settings/plugins/ifnet/nm-ifnet-connection.c +++ b/src/settings/plugins/ifnet/nm-ifnet-connection.c @@ -19,16 +19,16 @@ * Copyright (C) 1999-2010 Gentoo Foundation, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <glib/gstdio.h> -#include <nm-dbus-interface.h> -#include <nm-utils.h> -#include <nm-setting-wireless-security.h> -#include <nm-settings-connection.h> -#include <nm-settings-plugin.h> -#include "nm-default.h" + +#include "nm-dbus-interface.h" +#include "nm-utils.h" +#include "nm-setting-wireless-security.h" +#include "nm-settings-connection.h" +#include "nm-settings-plugin.h" #include "nm-ifnet-connection.h" #include "connection_parser.h" #include "net_parser.h" diff --git a/src/settings/plugins/ifnet/plugin.c b/src/settings/plugins/ifnet/plugin.c index b670cdac7..a0676cf89 100644 --- a/src/settings/plugins/ifnet/plugin.c +++ b/src/settings/plugins/ifnet/plugin.c @@ -20,14 +20,14 @@ * Copyright (C) 1999-2010 Gentoo Foundation, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <gmodule.h> -#include <nm-utils.h> -#include <nm-setting-connection.h> +#include "nm-utils.h" +#include "nm-setting-connection.h" #include "nm-default.h" #include "nm-dbus-interface.h" diff --git a/src/settings/plugins/ifnet/tests/test-ifnet.c b/src/settings/plugins/ifnet/tests/test-ifnet.c index 96fb5dd37..c870152b4 100644 --- a/src/settings/plugins/ifnet/tests/test-ifnet.c +++ b/src/settings/plugins/ifnet/tests/test-ifnet.c @@ -20,16 +20,16 @@ * Copyright (C) 1999-2010 Gentoo Foundation, Inc. */ -#include "config.h" +#include "nm-default.h" #include <stdio.h> #include <string.h> #include <arpa/inet.h> #include <stdlib.h> #include <unistd.h> -#include <nm-utils.h> -#include "nm-default.h" +#include "nm-utils.h" + #include "nm-linux-platform.h" #include "net_parser.h" diff --git a/src/settings/plugins/ifnet/wpa_parser.c b/src/settings/plugins/ifnet/wpa_parser.c index 9f228d0b7..501bca7aa 100644 --- a/src/settings/plugins/ifnet/wpa_parser.c +++ b/src/settings/plugins/ifnet/wpa_parser.c @@ -19,12 +19,12 @@ * Copyright (C) 1999-2010 Gentoo Foundation, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <stdlib.h> -#include <nm-settings-plugin.h> -#include "nm-default.h" + +#include "nm-settings-plugin.h" #include "wpa_parser.h" #include "net_parser.h" #include "net_utils.h" diff --git a/src/settings/plugins/ifupdown/interface_parser.c b/src/settings/plugins/ifupdown/interface_parser.c index 4606f5ab6..be7d387dc 100644 --- a/src/settings/plugins/ifupdown/interface_parser.c +++ b/src/settings/plugins/ifupdown/interface_parser.c @@ -20,16 +20,17 @@ * (C) Copyright 2004 Tom Parker */ -#include "config.h" +#include "nm-default.h" #include "interface_parser.h" + #include <stdio.h> #include <stdlib.h> #include <string.h> #include <wordexp.h> #include <libgen.h> + #include "nm-utils.h" -#include "nm-default.h" if_block* first; if_block* last; diff --git a/src/settings/plugins/ifupdown/nm-ifupdown-connection.c b/src/settings/plugins/ifupdown/nm-ifupdown-connection.c index 2c8504b00..19de1db62 100644 --- a/src/settings/plugins/ifupdown/nm-ifupdown-connection.c +++ b/src/settings/plugins/ifupdown/nm-ifupdown-connection.c @@ -21,16 +21,16 @@ * (C) Copyright 2007,2008 Canonical Ltd. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <glib/gstdio.h> -#include <nm-dbus-interface.h> -#include <nm-utils.h> -#include <nm-setting-wireless-security.h> -#include <nm-settings-connection.h> -#include <nm-settings-plugin.h> -#include "nm-default.h" + +#include "nm-dbus-interface.h" +#include "nm-utils.h" +#include "nm-setting-wireless-security.h" +#include "nm-settings-connection.h" +#include "nm-settings-plugin.h" #include "nm-ifupdown-connection.h" #include "parser.h" diff --git a/src/settings/plugins/ifupdown/parser.c b/src/settings/plugins/ifupdown/parser.c index 8a3d4551d..bd200cd58 100644 --- a/src/settings/plugins/ifupdown/parser.c +++ b/src/settings/plugins/ifupdown/parser.c @@ -21,7 +21,7 @@ * (C) Copyright 2008 Canonical Ltd. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <arpa/inet.h> @@ -31,7 +31,6 @@ #include "nm-core-internal.h" #include "nm-settings-plugin.h" -#include "nm-default.h" #include "parser.h" #include "plugin.h" diff --git a/src/settings/plugins/ifupdown/plugin.c b/src/settings/plugins/ifupdown/plugin.c index fc361de5c..dbc96eacc 100644 --- a/src/settings/plugins/ifupdown/plugin.c +++ b/src/settings/plugins/ifupdown/plugin.c @@ -22,14 +22,15 @@ * (C) Copyright 2009 - 2011 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> - +#include <arpa/inet.h> +#include <gudev/gudev.h> #include <gmodule.h> -#include <nm-setting-connection.h> -#include "nm-default.h" +#include "nm-setting-connection.h" + #include "interface_parser.h" #include "nm-dbus-interface.h" @@ -48,10 +49,6 @@ #include "nm-config.h" -#include <arpa/inet.h> - -#include <gudev/gudev.h> - #define ENI_INTERFACES_FILE "/etc/network/interfaces" #define IFUPDOWN_PLUGIN_NAME "ifupdown" diff --git a/src/settings/plugins/ifupdown/tests/test-ifupdown.c b/src/settings/plugins/ifupdown/tests/test-ifupdown.c index 54f30d38b..f383821c3 100644 --- a/src/settings/plugins/ifupdown/tests/test-ifupdown.c +++ b/src/settings/plugins/ifupdown/tests/test-ifupdown.c @@ -18,11 +18,10 @@ * */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include "nm-default.h" #include "nm-core-internal.h" #include "interface_parser.h" #include "parser.h" diff --git a/src/settings/plugins/keyfile/nm-keyfile-connection.c b/src/settings/plugins/keyfile/nm-keyfile-connection.c index c217de68e..97a5ee4c5 100644 --- a/src/settings/plugins/keyfile/nm-keyfile-connection.c +++ b/src/settings/plugins/keyfile/nm-keyfile-connection.c @@ -19,21 +19,20 @@ * Copyright (C) 2008 - 2012 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <glib/gstdio.h> -#include <nm-dbus-interface.h> -#include <nm-setting-connection.h> -#include <nm-utils.h> -#include "nm-default.h" +#include "nm-dbus-interface.h" +#include "nm-setting-connection.h" +#include "nm-utils.h" + #include "nm-settings-plugin.h" #include "nm-keyfile-connection.h" #include "reader.h" #include "writer.h" #include "utils.h" -#include "nm-logging.h" G_DEFINE_TYPE (NMKeyfileConnection, nm_keyfile_connection, NM_TYPE_SETTINGS_CONNECTION) diff --git a/src/settings/plugins/keyfile/plugin.c b/src/settings/plugins/keyfile/plugin.c index e352e5235..29a1141b8 100644 --- a/src/settings/plugins/keyfile/plugin.c +++ b/src/settings/plugins/keyfile/plugin.c @@ -19,7 +19,7 @@ * Copyright (C) 2008 - 2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <sys/stat.h> #include <unistd.h> @@ -29,12 +29,11 @@ #include <gmodule.h> #include <glib/gstdio.h> -#include <nm-connection.h> -#include <nm-setting.h> -#include <nm-setting-connection.h> -#include <nm-utils.h> +#include "nm-connection.h" +#include "nm-setting.h" +#include "nm-setting-connection.h" +#include "nm-utils.h" #include "nm-config.h" -#include "nm-default.h" #include "nm-core-internal.h" #include "plugin.h" diff --git a/src/settings/plugins/keyfile/reader.c b/src/settings/plugins/keyfile/reader.c index 1c984a16d..264b26a43 100644 --- a/src/settings/plugins/keyfile/reader.c +++ b/src/settings/plugins/keyfile/reader.c @@ -18,14 +18,13 @@ * Copyright (C) 2015 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <sys/stat.h> #include <string.h> #include "reader.h" -#include "nm-default.h" #include "nm-keyfile-internal.h" #include "NetworkManagerUtils.h" diff --git a/src/settings/plugins/keyfile/tests/test-keyfile.c b/src/settings/plugins/keyfile/tests/test-keyfile.c index d7b0ecce9..775872424 100644 --- a/src/settings/plugins/keyfile/tests/test-keyfile.c +++ b/src/settings/plugins/keyfile/tests/test-keyfile.c @@ -18,7 +18,7 @@ * Copyright (C) 2008 - 2014 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <stdio.h> #include <stdarg.h> @@ -29,7 +29,6 @@ #include <sys/socket.h> #include "nm-core-internal.h" -#include "nm-default.h" #include "reader.h" #include "writer.h" diff --git a/src/settings/plugins/keyfile/utils.c b/src/settings/plugins/keyfile/utils.c index 48795ffb1..b5c306e4c 100644 --- a/src/settings/plugins/keyfile/utils.c +++ b/src/settings/plugins/keyfile/utils.c @@ -18,15 +18,15 @@ * (C) Copyright 2010 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <stdlib.h> #include <string.h> -#include "nm-default.h" + #include "utils.h" -#include <nm-setting-wired.h> -#include <nm-setting-wireless.h> -#include <nm-setting-wireless-security.h> +#include "nm-setting-wired.h" +#include "nm-setting-wireless.h" +#include "nm-setting-wireless-security.h" #include "nm-config.h" #define NM_CONFIG_KEYFILE_PATH_DEFAULT NMCONFDIR "/system-connections" diff --git a/src/settings/plugins/keyfile/writer.c b/src/settings/plugins/keyfile/writer.c index d03aba8ae..c8eb88009 100644 --- a/src/settings/plugins/keyfile/writer.c +++ b/src/settings/plugins/keyfile/writer.c @@ -19,7 +19,7 @@ * Copyright (C) 2008 - 2015 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <stdlib.h> #include <sys/stat.h> @@ -27,7 +27,6 @@ #include <errno.h> #include <string.h> -#include "nm-default.h" #include "writer.h" #include "utils.h" #include "nm-keyfile-internal.h" diff --git a/src/supplicant-manager/nm-supplicant-config.c b/src/supplicant-manager/nm-supplicant-config.c index 190ee0a7f..091742e58 100644 --- a/src/supplicant-manager/nm-supplicant-config.c +++ b/src/supplicant-manager/nm-supplicant-config.c @@ -19,12 +19,11 @@ * Copyright (C) 2007 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <stdlib.h> -#include "nm-default.h" #include "nm-supplicant-config.h" #include "nm-supplicant-settings-verify.h" #include "nm-setting.h" diff --git a/src/supplicant-manager/nm-supplicant-interface.c b/src/supplicant-manager/nm-supplicant-interface.c index 10081b597..ce7a2a2c9 100644 --- a/src/supplicant-manager/nm-supplicant-interface.c +++ b/src/supplicant-manager/nm-supplicant-interface.c @@ -19,12 +19,11 @@ * Copyright (C) 2006 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <stdio.h> #include <string.h> -#include "nm-default.h" #include "NetworkManagerUtils.h" #include "nm-supplicant-interface.h" #include "nm-supplicant-config.h" diff --git a/src/supplicant-manager/nm-supplicant-manager.c b/src/supplicant-manager/nm-supplicant-manager.c index 14254266a..9614c8ddd 100644 --- a/src/supplicant-manager/nm-supplicant-manager.c +++ b/src/supplicant-manager/nm-supplicant-manager.c @@ -19,11 +19,10 @@ * Copyright (C) 2007 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include "nm-default.h" #include "nm-supplicant-manager.h" #include "nm-supplicant-interface.h" #include "nm-supplicant-types.h" diff --git a/src/supplicant-manager/nm-supplicant-settings-verify.c b/src/supplicant-manager/nm-supplicant-settings-verify.c index f2d565405..ec660d189 100644 --- a/src/supplicant-manager/nm-supplicant-settings-verify.c +++ b/src/supplicant-manager/nm-supplicant-settings-verify.c @@ -18,14 +18,13 @@ * Copyright (C) 2006 - 2012 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <stdio.h> #include <stdlib.h> #include <string.h> #include <errno.h> -#include "nm-default.h" #include "nm-supplicant-settings-verify.h" struct Opt { diff --git a/src/supplicant-manager/tests/test-supplicant-config.c b/src/supplicant-manager/tests/test-supplicant-config.c index bd532b242..0c3e9a47d 100644 --- a/src/supplicant-manager/tests/test-supplicant-config.c +++ b/src/supplicant-manager/tests/test-supplicant-config.c @@ -18,7 +18,7 @@ * Copyright (C) 2008 - 2011 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <stdio.h> #include <stdarg.h> @@ -34,7 +34,6 @@ #include "nm-supplicant-config.h" #include "nm-supplicant-settings-verify.h" -#include "nm-default.h" #include "nm-test-utils.h" diff --git a/src/systemd/nm-sd-adapt.c b/src/systemd/nm-sd-adapt.c index 8b29aed51..e10df9c74 100644 --- a/src/systemd/nm-sd-adapt.c +++ b/src/systemd/nm-sd-adapt.c @@ -16,7 +16,7 @@ * Copyright (C) 2014 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <glib.h> #include <unistd.h> diff --git a/src/systemd/nm-sd-adapt.h b/src/systemd/nm-sd-adapt.h index 84a497caf..f48c86f1c 100644 --- a/src/systemd/nm-sd-adapt.h +++ b/src/systemd/nm-sd-adapt.h @@ -19,15 +19,13 @@ #ifndef NM_SD_ADAPT_H #define NM_SD_ADAPT_H -#include "config.h" +#include "nm-default.h" #include <stdbool.h> #include <syslog.h> #include <sys/resource.h> #include <time.h> -#include "nm-default.h" - #define noreturn G_GNUC_NORETURN #ifndef CLOCK_BOOTTIME diff --git a/src/tests/config/nm-test-device.c b/src/tests/config/nm-test-device.c index 681f49660..04ccaec21 100644 --- a/src/tests/config/nm-test-device.c +++ b/src/tests/config/nm-test-device.c @@ -18,7 +18,7 @@ * Copyright 2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> diff --git a/src/tests/config/test-config.c b/src/tests/config/test-config.c index e8de86c8a..19306df72 100644 --- a/src/tests/config/test-config.c +++ b/src/tests/config/test-config.c @@ -18,13 +18,11 @@ * */ -#include "config.h" +#include "nm-default.h" #include <unistd.h> - #include "nm-config.h" -#include "nm-default.h" #include "nm-test-device.h" #include "nm-fake-platform.h" #include "nm-bus-manager.h" diff --git a/src/tests/test-dcb.c b/src/tests/test-dcb.c index 35f1ed0fa..e8e1ec860 100644 --- a/src/tests/test-dcb.c +++ b/src/tests/test-dcb.c @@ -18,11 +18,10 @@ * */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include "nm-default.h" #include "nm-dcb.h" #include "nm-test-utils.h" diff --git a/src/tests/test-general-with-expect.c b/src/tests/test-general-with-expect.c index 0796f7caa..43595c8de 100644 --- a/src/tests/test-general-with-expect.c +++ b/src/tests/test-general-with-expect.c @@ -18,7 +18,7 @@ * */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <errno.h> @@ -27,7 +27,6 @@ #include <sys/types.h> #include <sys/wait.h> -#include "nm-default.h" #include "NetworkManagerUtils.h" #include "nm-multi-index.h" diff --git a/src/tests/test-general.c b/src/tests/test-general.c index ffbeae14e..b8a51f2aa 100644 --- a/src/tests/test-general.c +++ b/src/tests/test-general.c @@ -18,12 +18,11 @@ * */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <errno.h> -#include "nm-default.h" #include "NetworkManagerUtils.h" #include "nm-core-internal.h" diff --git a/src/tests/test-ip4-config.c b/src/tests/test-ip4-config.c index 16cd3d1ef..2b743c8c3 100644 --- a/src/tests/test-ip4-config.c +++ b/src/tests/test-ip4-config.c @@ -18,12 +18,11 @@ * */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <arpa/inet.h> -#include "nm-default.h" #include "nm-ip4-config.h" #include "nm-platform.h" diff --git a/src/tests/test-ip6-config.c b/src/tests/test-ip6-config.c index 2639a1f0d..5a2bb5890 100644 --- a/src/tests/test-ip6-config.c +++ b/src/tests/test-ip6-config.c @@ -18,12 +18,11 @@ * */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <arpa/inet.h> -#include "nm-default.h" #include "nm-ip6-config.h" #include "nm-platform.h" diff --git a/src/tests/test-resolvconf-capture.c b/src/tests/test-resolvconf-capture.c index db7006ba6..31b6e1777 100644 --- a/src/tests/test-resolvconf-capture.c +++ b/src/tests/test-resolvconf-capture.c @@ -18,12 +18,11 @@ * */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <arpa/inet.h> -#include "nm-default.h" #include "NetworkManagerUtils.h" #include "nm-ip4-config.h" #include "nm-ip6-config.h" diff --git a/src/tests/test-route-manager.c b/src/tests/test-route-manager.c index 347c122c3..742f4ee5c 100644 --- a/src/tests/test-route-manager.c +++ b/src/tests/test-route-manager.c @@ -18,12 +18,11 @@ * */ -#include "config.h" +#include "nm-default.h" #include <arpa/inet.h> #include <linux/rtnetlink.h> -#include "nm-default.h" #include "test-common.h" #include "nm-platform.h" diff --git a/src/tests/test-utils.c b/src/tests/test-utils.c index 79a7e6803..58eca5f3f 100644 --- a/src/tests/test-utils.c +++ b/src/tests/test-utils.c @@ -18,7 +18,7 @@ * */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <errno.h> diff --git a/src/tests/test-wired-defname.c b/src/tests/test-wired-defname.c index 989345d80..6edd5ff24 100644 --- a/src/tests/test-wired-defname.c +++ b/src/tests/test-wired-defname.c @@ -18,12 +18,10 @@ * */ -#include "config.h" - - -#include <nm-simple-connection.h> -#include <nm-setting-connection.h> #include "nm-default.h" + +#include "nm-simple-connection.h" +#include "nm-setting-connection.h" #include "nm-device-ethernet-utils.h" #include "nm-test-utils.h" diff --git a/src/vpn-manager/nm-vpn-connection.c b/src/vpn-manager/nm-vpn-connection.c index 23598afec..653b99723 100644 --- a/src/vpn-manager/nm-vpn-connection.c +++ b/src/vpn-manager/nm-vpn-connection.c @@ -19,7 +19,7 @@ * Copyright (C) 2006 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <sys/socket.h> @@ -28,7 +28,6 @@ #include <errno.h> #include <stdlib.h> -#include "nm-default.h" #include "nm-vpn-connection.h" #include "nm-ip4-config.h" #include "nm-ip6-config.h" diff --git a/src/vpn-manager/nm-vpn-manager.c b/src/vpn-manager/nm-vpn-manager.c index 45d22998b..6dcd54638 100644 --- a/src/vpn-manager/nm-vpn-manager.c +++ b/src/vpn-manager/nm-vpn-manager.c @@ -19,11 +19,10 @@ * Copyright (C) 2006 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include "nm-default.h" #include "nm-vpn-manager.h" #include "nm-vpn-plugin-info.h" #include "nm-vpn-connection.h" |