From 45b959f601d103c9c308807b55f62f1859556b59 Mon Sep 17 00:00:00 2001 From: Mikkel Oscar Lyderik Date: Mon, 14 Dec 2015 17:07:31 +0100 Subject: [PATCH] Move numlen(1) to sway/util.c --- include/util.h | 5 +++++ sway/util.c | 10 ++++++++++ swaygrab/main.c | 11 +---------- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/include/util.h b/include/util.h index 8e65e6d6..9cb861dd 100644 --- a/include/util.h +++ b/include/util.h @@ -6,4 +6,9 @@ */ int wrap(int i, int max); +/** + * Count number of digits in int + */ +int numlen(int n); + #endif diff --git a/sway/util.c b/sway/util.c index 9a59ddf9..ed6d033f 100644 --- a/sway/util.c +++ b/sway/util.c @@ -3,3 +3,13 @@ int wrap(int i, int max) { return ((i % max) + max) % max; } + +int numlen(int n) { + if (n >= 1000000) return 7; + if (n >= 100000) return 6; + if (n >= 10000) return 5; + if (n >= 1000) return 4; + if (n >= 100) return 3; + if (n >= 10) return 2; + return 1; +} diff --git a/swaygrab/main.c b/swaygrab/main.c index 681a6da4..2c6cf2dd 100644 --- a/swaygrab/main.c +++ b/swaygrab/main.c @@ -8,21 +8,12 @@ #include #include "log.h" #include "ipc-client.h" +#include "util.h" void sway_terminate(void) { exit(EXIT_FAILURE); } -int numlen(int n) { - if (n >= 1000000) return 7; - if (n >= 100000) return 6; - if (n >= 10000) return 5; - if (n >= 1000) return 4; - if (n >= 100) return 3; - if (n >= 10) return 2; - return 1; -} - void grab_and_apply_magick(const char *file, const char *output, int socketfd, int raw) { uint32_t len = strlen(output);