From 138a7d1e677c2d3a7fd032d1bee59b4dbc800111 Mon Sep 17 00:00:00 2001 From: Otavio Pontes Date: Thu, 17 Jan 2019 16:59:55 +0000 Subject: [PATCH] Rename files replacing - with _ Signed-off-by: Otavio Pontes --- Makefile.am | 12 ++++++------ src/curl.c | 2 +- src/curl_async.c | 2 +- src/hash.c | 2 +- src/helpers.c | 2 +- src/main.c | 4 ++-- src/manifest.c | 2 +- src/packs.c | 2 +- src/staging.c | 2 +- src/swupd.h | 4 ++-- src/{swupd-build-opts.h => swupd_build_opts.h} | 0 src/{swupd-build-variant.h => swupd_build_variant.h} | 0 src/{swupd-curl.h => swupd_curl.h} | 0 src/{swupd-curl-internal.h => swupd_curl_internal.h} | 2 +- src/{swupd-error.h => swupd_error.h} | 0 src/{swupd-internal.h => swupd_internal.h} | 0 16 files changed, 18 insertions(+), 18 deletions(-) rename src/{swupd-build-opts.h => swupd_build_opts.h} (100%) rename src/{swupd-build-variant.h => swupd_build_variant.h} (100%) rename src/{swupd-curl.h => swupd_curl.h} (100%) rename src/{swupd-curl-internal.h => swupd_curl_internal.h} (98%) rename src/{swupd-error.h => swupd_error.h} (100%) rename src/{swupd-internal.h => swupd_internal.h} (100%) diff --git a/Makefile.am b/Makefile.am index 207c8022..79e00373 100644 --- a/Makefile.am +++ b/Makefile.am @@ -70,12 +70,12 @@ swupd_SOURCES = \ src/staging.c \ src/stats.c \ src/subscriptions.c \ - src/swupd-build-opts.h \ - src/swupd-build-variant.h \ - src/swupd-curl-internal.h \ - src/swupd-curl.h \ - src/swupd-error.h \ - src/swupd-internal.h \ + src/swupd_build_opts.h \ + src/swupd_build_variant.h \ + src/swupd_curl_internal.h \ + src/swupd_curl.h \ + src/swupd_error.h \ + src/swupd_internal.h \ src/swupd.h \ src/telemetry.c \ src/timelist.c \ diff --git a/src/curl.c b/src/curl.c index a4f84f7b..7d52be0a 100644 --- a/src/curl.c +++ b/src/curl.c @@ -44,8 +44,8 @@ #include #include "config.h" -#include "swupd-curl-internal.h" #include "swupd.h" +#include "swupd_curl_internal.h" #define SWUPD_CURL_LOW_SPEED_LIMIT 1 #define SWUPD_CURL_CONNECT_TIMEOUT 30 diff --git a/src/curl_async.c b/src/curl_async.c index 01e7fadc..169a85e4 100644 --- a/src/curl_async.c +++ b/src/curl_async.c @@ -36,8 +36,8 @@ #include "config.h" #include "lib/hashmap.h" #include "lib/thread_pool.h" -#include "swupd-curl-internal.h" #include "swupd.h" +#include "swupd_curl_internal.h" #define MAX_RETRIES 5 #define RETRY_TIMEOUT 10 diff --git a/src/hash.c b/src/hash.c index 3869cfbb..a405223a 100644 --- a/src/hash.c +++ b/src/hash.c @@ -32,8 +32,8 @@ #include #include -#include "swupd-build-variant.h" #include "swupd.h" +#include "swupd_build_variant.h" #include "xattrs.h" void hash_assign(const char *src, char *dst) diff --git a/src/helpers.c b/src/helpers.c index a642d9d2..22aef730 100644 --- a/src/helpers.c +++ b/src/helpers.c @@ -39,8 +39,8 @@ #include "config.h" #include "signature.h" -#include "swupd-build-variant.h" #include "swupd.h" +#include "swupd_build_variant.h" #include "verifytime.h" void check_root(void) diff --git a/src/main.c b/src/main.c index a97c68d3..2fac0a51 100644 --- a/src/main.c +++ b/src/main.c @@ -24,9 +24,9 @@ #include #include -#include "swupd-build-opts.h" -#include "swupd-internal.h" #include "swupd.h" +#include "swupd_build_opts.h" +#include "swupd_internal.h" struct subcmd { char *name; diff --git a/src/manifest.c b/src/manifest.c index 89c68067..75d0c8fc 100644 --- a/src/manifest.c +++ b/src/manifest.c @@ -37,8 +37,8 @@ #include "config.h" #include "signature.h" -#include "swupd-build-variant.h" #include "swupd.h" +#include "swupd_build_variant.h" #include "xattrs.h" #define MANIFEST_LINE_MAXLEN 8192 diff --git a/src/packs.c b/src/packs.c index 4abb6893..8188dd65 100644 --- a/src/packs.c +++ b/src/packs.c @@ -32,8 +32,8 @@ #include "config.h" #include "signature.h" -#include "swupd-build-variant.h" #include "swupd.h" +#include "swupd_build_variant.h" /* hysteresis thresholds */ /* TODO: update MAX_XFER after bug #562 is fixed. diff --git a/src/staging.c b/src/staging.c index 09a4f7d1..ba70f592 100644 --- a/src/staging.c +++ b/src/staging.c @@ -33,8 +33,8 @@ #include #include "config.h" -#include "swupd-build-variant.h" #include "swupd.h" +#include "swupd_build_variant.h" /* clean then recreate temporary folder for tar renames */ static int create_staging_renamedir(char *rename_tmpdir) diff --git a/src/swupd.h b/src/swupd.h index 7aaed904..b1abb88e 100644 --- a/src/swupd.h +++ b/src/swupd.h @@ -16,8 +16,8 @@ #include "lib/macros.h" #include "lib/strings.h" #include "lib/sys.h" -#include "swupd-curl.h" -#include "swupd-error.h" +#include "swupd_curl.h" +#include "swupd_error.h" #include "timelist.h" #ifdef __cplusplus diff --git a/src/swupd-build-opts.h b/src/swupd_build_opts.h similarity index 100% rename from src/swupd-build-opts.h rename to src/swupd_build_opts.h diff --git a/src/swupd-build-variant.h b/src/swupd_build_variant.h similarity index 100% rename from src/swupd-build-variant.h rename to src/swupd_build_variant.h diff --git a/src/swupd-curl.h b/src/swupd_curl.h similarity index 100% rename from src/swupd-curl.h rename to src/swupd_curl.h diff --git a/src/swupd-curl-internal.h b/src/swupd_curl_internal.h similarity index 98% rename from src/swupd-curl-internal.h rename to src/swupd_curl_internal.h index 52fd4ea1..ac64298d 100644 --- a/src/swupd-curl-internal.h +++ b/src/swupd_curl_internal.h @@ -7,7 +7,7 @@ #include -#include "swupd-curl.h" +#include "swupd_curl.h" #ifdef __cplusplus extern "C" { diff --git a/src/swupd-error.h b/src/swupd_error.h similarity index 100% rename from src/swupd-error.h rename to src/swupd_error.h diff --git a/src/swupd-internal.h b/src/swupd_internal.h similarity index 100% rename from src/swupd-internal.h rename to src/swupd_internal.h