From 4c90a6a27f62f1d8a9f6dd4a743f7aee57230e67 Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Sat, 26 Mar 2022 13:44:06 +0300 Subject: [PATCH] Don't use spaces before ellipses --- bin/xbps-create/main.c | 2 +- bin/xbps-install/state_cb.c | 12 +++++------ bin/xbps-pkgdb/check.c | 2 +- bin/xbps-reconfigure/main.c | 4 ++-- bin/xbps-remove/main.c | 2 +- bin/xbps-rindex/index-clean.c | 2 +- configure | 40 +++++++++++++++++------------------ 7 files changed, 32 insertions(+), 32 deletions(-) diff --git a/bin/xbps-create/main.c b/bin/xbps-create/main.c index 985a18d6d..68805e162 100644 --- a/bin/xbps-create/main.c +++ b/bin/xbps-create/main.c @@ -765,7 +765,7 @@ process_archive(struct archive *ar, continue; if (!quiet) { - printf("%s: adding `%s' ...\n", pkgver, xe->file); + printf("%s: adding `%s'...\n", pkgver, xe->file); fflush(stdout); } process_entry_file(ar, resolver, xe, NULL); diff --git a/bin/xbps-install/state_cb.c b/bin/xbps-install/state_cb.c index 495ebb2bd..6e6b5fc49 100644 --- a/bin/xbps-install/state_cb.c +++ b/bin/xbps-install/state_cb.c @@ -66,7 +66,7 @@ state_cb(const struct xbps_state_cb_data *xscd, void *cbdata UNUSED) printf("[*] pkgdb upgrade in progress, please wait...\n"); break; case XBPS_STATE_REPOSYNC: - printf("[*] Updating repository `%s' ...\n", xscd->arg); + printf("[*] Updating repository `%s'...\n", xscd->arg); break; case XBPS_STATE_TRANS_ADDPKG: if (xscd->xhp->flags & XBPS_FLAG_VERBOSE) @@ -83,16 +83,16 @@ state_cb(const struct xbps_state_cb_data *xscd, void *cbdata UNUSED) printf("%s\n", xscd->desc); break; case XBPS_STATE_REMOVE: - printf("%s: removing ...\n", xscd->arg); + printf("%s: removing...\n", xscd->arg); break; case XBPS_STATE_CONFIGURE: - printf("%s: configuring ...\n", xscd->arg); + printf("%s: configuring...\n", xscd->arg); break; case XBPS_STATE_CONFIGURE_DONE: /* empty */ break; case XBPS_STATE_UNPACK: - printf("%s: unpacking ...\n", xscd->arg); + printf("%s: unpacking...\n", xscd->arg); break; case XBPS_STATE_INSTALL: case XBPS_STATE_DOWNLOAD: @@ -105,9 +105,9 @@ state_cb(const struct xbps_state_cb_data *xscd, void *cbdata UNUSED) newver = xbps_pkg_version(xscd->arg); pkgd = xbps_pkgdb_get_pkg(xscd->xhp, pkgname); xbps_dictionary_get_cstring_nocopy(pkgd, "pkgver", &instver); - printf("%s: updating to %s ...\n", instver, newver); + printf("%s: updating to %s...\n", instver, newver); if (slog) { - syslog(LOG_NOTICE, "%s: updating to %s ... " + syslog(LOG_NOTICE, "%s: updating to %s... " "(rootdir: %s)\n", instver, newver, xscd->xhp->rootdir); } diff --git a/bin/xbps-pkgdb/check.c b/bin/xbps-pkgdb/check.c index 061d521c6..57e90bee6 100644 --- a/bin/xbps-pkgdb/check.c +++ b/bin/xbps-pkgdb/check.c @@ -48,7 +48,7 @@ pkgdb_cb(struct xbps_handle *xhp UNUSED, xbps_dictionary_get_cstring_nocopy(obj, "pkgver", &pkgver); if (xhp->flags & XBPS_FLAG_VERBOSE) - printf("Checking %s ...\n", pkgver); + printf("Checking %s...\n", pkgver); if (!xbps_pkg_name(pkgname, sizeof(pkgname), pkgver)) { abort(); diff --git a/bin/xbps-reconfigure/main.c b/bin/xbps-reconfigure/main.c index 2cd41d58a..af9774f7c 100644 --- a/bin/xbps-reconfigure/main.c +++ b/bin/xbps-reconfigure/main.c @@ -64,9 +64,9 @@ state_cb(const struct xbps_state_cb_data *xscd, void *cbd UNUSED) switch (xscd->state) { /* notifications */ case XBPS_STATE_CONFIGURE: - printf("%s: configuring ...\n", xscd->arg); + printf("%s: configuring...\n", xscd->arg); if (slog) - syslog(LOG_NOTICE, "%s: configuring ...", xscd->arg); + syslog(LOG_NOTICE, "%s: configuring...", xscd->arg); break; case XBPS_STATE_CONFIGURE_DONE: printf("%s: configured successfully.\n", xscd->arg); diff --git a/bin/xbps-remove/main.c b/bin/xbps-remove/main.c index 02edb97b6..2bb498f40 100644 --- a/bin/xbps-remove/main.c +++ b/bin/xbps-remove/main.c @@ -76,7 +76,7 @@ state_cb_rm(const struct xbps_state_cb_data *xscd, void *cbdata UNUSED) switch (xscd->state) { /* notifications */ case XBPS_STATE_REMOVE: - printf("Removing `%s' ...\n", xscd->arg); + printf("Removing `%s'...\n", xscd->arg); break; /* success */ case XBPS_STATE_REMOVE_FILE: diff --git a/bin/xbps-rindex/index-clean.c b/bin/xbps-rindex/index-clean.c index b6c57c952..b23bf1151 100644 --- a/bin/xbps-rindex/index-clean.c +++ b/bin/xbps-rindex/index-clean.c @@ -59,7 +59,7 @@ idx_cleaner_cb(struct xbps_handle *xhp, xbps_dictionary_get_cstring_nocopy(obj, "architecture", &arch); xbps_dictionary_get_cstring_nocopy(obj, "pkgver", &pkgver); - xbps_dbg_printf(xhp, "%s: checking %s [%s] ...\n", info->repourl, pkgver, arch); + xbps_dbg_printf(xhp, "%s: checking %s [%s]...\n", info->repourl, pkgver, arch); filen = xbps_xasprintf("%s/%s.%s.xbps", info->repourl, pkgver, arch); if (access(filen, R_OK) == -1) { diff --git a/configure b/configure index 43985bb40..f84174d39 100755 --- a/configure +++ b/configure @@ -147,7 +147,7 @@ if [ -z "$OS" ]; then KERNEL=${REST%%-*} fi -echo "Configuring xbps for ... $OS" +echo "Configuring xbps for... $OS" rm -f $CONFIG_MK echo "# Common vars used by XBPS on $OS." >$CONFIG_MK @@ -169,7 +169,7 @@ ETCDIR="${SYSCONFDIR}/xbps.d" echo "ETCDIR ?= $ETCDIR" >>$CONFIG_MK if [ -z "$CC" ]; then - printf "Looking for compiler ... " + printf "Looking for compiler... " for b in $TARGET- ""; do for cc in gcc icc clang tcc pcc cc; do if type $b$cc >/dev/null 2>&1; then @@ -241,7 +241,7 @@ check_compiler_flag() [ -z "$var" ] && var="CFLAGS" - printf "Checking if $CC supports -${mode}${flag} ... " + printf "Checking if $CC supports -${mode}${flag}... " cat <_ccflag.c #include int main(void) { return 0; } @@ -382,7 +382,7 @@ echo "CFLAGS += -pthread" >>$CONFIG_MK # Check for GCC atomic builtins. # func=atomic -printf "Checking for GCC atomic builtins ... " +printf "Checking for GCC atomic builtins... " cat <_$func.c int main() { volatile unsigned long val = 1; @@ -407,7 +407,7 @@ fi # Check for vasprintf(). # func=vasprintf -printf "Checking for $func() ... " +printf "Checking for $func()... " if test -n "$HAVE_VASPRINTF"; then echo "yes (cached)." else @@ -440,7 +440,7 @@ fi # Check for strcasestr(). # func=strcasestr -printf "Checking for $func() ... " +printf "Checking for $func()... " cat <_$func.c #define _GNU_SOURCE #include @@ -464,7 +464,7 @@ rm -f _$func _$func.c # Check for strlcpy(). # func=strlcpy -printf "Checking for $func() ... " +printf "Checking for $func()... " cat <_$func.c #include int main(void) { @@ -486,7 +486,7 @@ rm -f _$func.c _$func # # Check for strlcat(). func=strlcat -printf "Checking for $func() ... " +printf "Checking for $func()... " cat < _$func.c #include int main(void) { @@ -508,7 +508,7 @@ rm -f _$func.c _$func # # Check for strnstr(). func=strnstr -printf "Checking for $func() ... " +printf "Checking for $func()... " cat < _$func.c #include int main(void) { @@ -529,7 +529,7 @@ rm -f _$func.c _$func # # Check for humanize_number(). func=humanize_number -printf "Checking for $func() ... " +printf "Checking for $func()... " cat < _$func.c #include #include @@ -552,7 +552,7 @@ rm -f _$func.c _$func # Check for rbtree_ininit(). # func=rb_tree_init -printf "Checking for $func() ... " +printf "Checking for $func()... " cat < _$func.c #include int main(void) { @@ -573,7 +573,7 @@ rm -f _$func.c _$func # Check for fdatasync(). # func=fdatasync -printf "Checking for $func() ... " +printf "Checking for $func()... " cat < _$func.c #include int main(void) { @@ -593,7 +593,7 @@ rm -f _$func.c _$func # Check for clock_gettime(3). # func=clock_gettime -printf "Checking for $func() ... " +printf "Checking for $func()... " cat < _$func.c #include int main(void) { @@ -616,7 +616,7 @@ rm -f _$func.c _$func # zlib is required. # func=InflateInit2 -printf "Checking for $func() ... " +printf "Checking for $func()... " cat < _$func.c #include int main(void) { @@ -648,7 +648,7 @@ fi # if [ -n "$BUILD_API_DOCS" ]; then echo "Building API documentation via doxygen and graphviz." - printf "Checking for doxygen ..." + printf "Checking for doxygen... " DOXYGEN_BIN=$(_which doxygen) if [ -z "$DOXYGEN_BIN" ]; then echo "not found, exiting." @@ -656,7 +656,7 @@ if [ -n "$BUILD_API_DOCS" ]; then else echo yes fi - printf "Checking for graphviz ... " + printf "Checking for graphviz... " DOT_BIN=$(_which dot) if [ -z "$DOT_BIN" ]; then echo "dot(1) command not found, exiting." @@ -674,7 +674,7 @@ fi # # pkg-config is required to know dependencies for static linking. # -printf "Checking for pkg-config ... " +printf "Checking for pkg-config... " PKGCONFIG_BIN=$(_which pkg-config) if [ -z "$PKGCONFIG_BIN" ]; then echo "not found, exiting." @@ -688,7 +688,7 @@ fi # LIBARCHIVE_REQVER=3.3.3 -printf "Checking for libarchive >= ${LIBARCHIVE_REQVER} via pkg-config ... " +printf "Checking for libarchive >= ${LIBARCHIVE_REQVER} via pkg-config... " if ! pkg-config --atleast-version=${LIBARCHIVE_REQVER} libarchive; then echo "libarchive.pc file not found, exiting." exit 1 @@ -703,7 +703,7 @@ fi # # libssl with pkg-config support is required. # -printf "Checking for libssl via pkg-config ... " +printf "Checking for libssl via pkg-config... " if pkg-config --exists 'libssl' && ! pkg-config --exists libtls ; then echo "found OpenSSL version $(pkg-config --modversion libssl)." elif pkg-config --exists libssl libtls; then @@ -731,7 +731,7 @@ fi # If --enable-tests enabled, check for ATF >= 0.15 via pkg-config. # if [ "$BUILD_TESTS" = "yes" ]; then - printf "Checking for ATF via pkg-config ... " + printf "Checking for ATF via pkg-config... " if ! pkg-config --atleast-version=0.15 atf-c; then echo "ATF >= 0.15 not found in PKG_CONFIG_LIBDIR, exiting." exit 1