Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't use spaces before ellipses #479

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Don't use spaces before ellipses #479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bin/xbps-create/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
12 changes: 6 additions & 6 deletions bin/xbps-install/state_cb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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:
Expand All @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion bin/xbps-pkgdb/check.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
4 changes: 2 additions & 2 deletions bin/xbps-reconfigure/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion bin/xbps-remove/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion bin/xbps-rindex/index-clean.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
40 changes: 20 additions & 20 deletions configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand Down Expand Up @@ -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 <<EOF >_ccflag.c
#include <stdio.h>
int main(void) { return 0; }
Expand Down Expand Up @@ -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 <<EOF >_$func.c
int main() {
volatile unsigned long val = 1;
Expand All @@ -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
Expand Down Expand Up @@ -440,7 +440,7 @@ fi
# Check for strcasestr().
#
func=strcasestr
printf "Checking for $func() ... "
printf "Checking for $func()... "
cat <<EOF >_$func.c
#define _GNU_SOURCE
#include <string.h>
Expand All @@ -464,7 +464,7 @@ rm -f _$func _$func.c
# Check for strlcpy().
#
func=strlcpy
printf "Checking for $func() ... "
printf "Checking for $func()... "
cat <<EOF >_$func.c
#include <string.h>
int main(void) {
Expand All @@ -486,7 +486,7 @@ rm -f _$func.c _$func
#
# Check for strlcat().
func=strlcat
printf "Checking for $func() ... "
printf "Checking for $func()... "
cat <<EOF > _$func.c
#include <string.h>
int main(void) {
Expand All @@ -508,7 +508,7 @@ rm -f _$func.c _$func
#
# Check for strnstr().
func=strnstr
printf "Checking for $func() ... "
printf "Checking for $func()... "
cat <<EOF > _$func.c
#include <string.h>
int main(void) {
Expand All @@ -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 <<EOF > _$func.c
#include <stdio.h>
#include <util.h>
Expand All @@ -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 <<EOF > _$func.c
#include <sys/rbtree.h>
int main(void) {
Expand All @@ -573,7 +573,7 @@ rm -f _$func.c _$func
# Check for fdatasync().
#
func=fdatasync
printf "Checking for $func() ... "
printf "Checking for $func()... "
cat <<EOF > _$func.c
#include <unistd.h>
int main(void) {
Expand All @@ -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 <<EOF > _$func.c
#include <time.h>
int main(void) {
Expand All @@ -616,7 +616,7 @@ rm -f _$func.c _$func
# zlib is required.
#
func=InflateInit2
printf "Checking for $func() ... "
printf "Checking for $func()... "
cat <<EOF > _$func.c
#include <zlib.h>
int main(void) {
Expand Down Expand Up @@ -648,15 +648,15 @@ fi
#
if [ -n "$BUILD_API_DOCS" ]; then
echo "Building API documentation via doxygen and graphviz."
printf "Checking for doxygen ..."
printf "Checking for doxygen... "
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I took the liberty of adding what seemed to be a missing space here, hope you all don't mind.

DOXYGEN_BIN=$(_which doxygen)
if [ -z "$DOXYGEN_BIN" ]; then
echo "not found, exiting."
exit 1
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."
Expand All @@ -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."
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down