From 0047320ccbd66f4ef1db00eb1461f9d2e4f320b9 Mon Sep 17 00:00:00 2001 From: Abraham Hernandez Date: Fri, 9 Nov 2018 15:52:01 -0500 Subject: [PATCH 1/4] Merge pull request #5 from abranhe/1.0.3 tryting to fix #4 --- binary-cli.c | 2 +- package.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/binary-cli.c b/binary-cli.c index 9f16410..dd74183 100644 --- a/binary-cli.c +++ b/binary-cli.c @@ -40,7 +40,7 @@ main(int argc, char **argv) { if (argc == 2) { if (!strcmp(a, "-v") || !strcmp(a, "--version")) { - printf("%s", "1.0.2\n"); + printf("%s", "1.0.3\n"); return 0; } diff --git a/package.json b/package.json index 02eb624..7cc471b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "binary", - "version": "1.0.2", + "version": "1.0.3", "description": "An small library to work with binary numbers", "license": "MIT", "keywords": [ @@ -10,7 +10,7 @@ "cli", "binary" ], - "repo": "abranhe/binary.c", + "repo": "abranhe/binary", "dependencies": { "abranhe/binary.c": "1.0.0" }, From cab8abb4d6d87964043175bd2881c938d9ca9ab5 Mon Sep 17 00:00:00 2001 From: Carlos Abraham Date: Fri, 25 Jan 2019 14:07:54 -0500 Subject: [PATCH 2/4] jump to 1.0.4 --- .gitignore | 4 ++-- .travis.yml | 18 ++++++++++++++---- Makefile | 2 +- binary-cli.c => cli.c | 4 +++- 4 files changed, 20 insertions(+), 8 deletions(-) rename binary-cli.c => cli.c (96%) diff --git a/.gitignore b/.gitignore index b4b23c1..f3c567e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -*.DS_STORE +*.DS_Store *.o *.log *.gcov @@ -7,4 +7,4 @@ binary test example -coverage +deps/ \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 3cb95fa..f694616 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,17 @@ language: c + +services: + - docker + compiler: -- clang -- gcc -script: make run-test + - clang + - gcc + +before_install: + - docker pull abranhe/clib + - docker run -it -v $(pwd):/src -w /src abranhe/clib sh -c "clib install" + +script: docker run -it -v $(pwd):/src -w /src abranhe/clib sh -c "make run-test" + notifications: - email: false + email: false \ No newline at end of file diff --git a/Makefile b/Makefile index 67939ba..b6f24b5 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ PREFIX ?= /usr/local -SRC = binary-cli.c deps/binary.c/binary.c +SRC = cli.c deps/binary.c/binary.c OBJ_SRC = $(SRC:.c=.o) diff --git a/binary-cli.c b/cli.c similarity index 96% rename from binary-cli.c rename to cli.c index dd74183..d3e9f44 100644 --- a/binary-cli.c +++ b/cli.c @@ -13,6 +13,8 @@ #include #include "binary.h" +#define VERSION "1.0.4" + const char *show_help() { return "\n\ @@ -40,7 +42,7 @@ main(int argc, char **argv) { if (argc == 2) { if (!strcmp(a, "-v") || !strcmp(a, "--version")) { - printf("%s", "1.0.3\n"); + printf("%s\n", VERSION); return 0; } From 196d1365bed4d45a0e7a4c04a1c890aebec7254b Mon Sep 17 00:00:00 2001 From: Carlos Abraham Date: Fri, 25 Jan 2019 14:16:29 -0500 Subject: [PATCH 3/4] removed cahed folder --- deps/binary.c/binary.c | 61 -------------------------------------- deps/binary.c/binary.h | 29 ------------------ deps/binary.c/package.json | 14 --------- 3 files changed, 104 deletions(-) delete mode 100644 deps/binary.c/binary.c delete mode 100644 deps/binary.c/binary.h delete mode 100644 deps/binary.c/package.json diff --git a/deps/binary.c/binary.c b/deps/binary.c/binary.c deleted file mode 100644 index 136d4f3..0000000 --- a/deps/binary.c/binary.c +++ /dev/null @@ -1,61 +0,0 @@ -// -// An small library to work with -// binary numbers. -// -// binary.c -// -// MIT licensed. -// Copyright (c) Abraham Hernandez -// - -#include - -bool -is_binary (long long binary) { - bool status = true; - while(true) { - if (binary == 0) break; - else { - int tmp = binary % 10; - if(tmp > 1) { - status = false; - break; - } - binary = binary / 10; - } - } - return status; -} - -long -to_decimal (long long binary) { - if(!is_binary(binary)) return -1; - - int decimal = 0; - int multiplier = 1; - - while (binary != 0) { - decimal += (binary % 10) * multiplier; - binary /= 10; - multiplier *= 2; - } - return decimal; -} - -long long to_binary(long number) { - long long binary = 0; - int remainder; - int i = 1; - - while (number != 0) { - remainder = number % 2; - number /= 2; - binary += remainder * i; - i *= 10; - } - return binary; -} - -// TODO: -// add_binary() -// substract_binary() ... diff --git a/deps/binary.c/binary.h b/deps/binary.c/binary.h deleted file mode 100644 index 70bcb95..0000000 --- a/deps/binary.c/binary.h +++ /dev/null @@ -1,29 +0,0 @@ -#ifndef BINARY_H -#define BINARY_H - -// -// binary.h -// -// MIT licensed. -// Copyright (c) Abraham Hernandez -// - -#define bool int - -#ifdef __cplusplus -extern "C" { -#endif - -bool -is_binary(long binary); - -long -to_decimal(long long binary); - -long long to_binary(long number); - -#ifdef __cplusplus -} -#endif - -#endif // BINARY_H diff --git a/deps/binary.c/package.json b/deps/binary.c/package.json deleted file mode 100644 index af97db7..0000000 --- a/deps/binary.c/package.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "binary.c", - "version": "1.0.0", - "description": "An small library to work with binary numbers", - "license": "MIT", - "keywords": [ - "binary", "binary-numbers" - ], - "repo": "abranhe/binary.c", - "src": [ - "binary.h", - "binary.c" - ] -} From 98e0ae2947d60b7eba2b6085761ce0997eb7220a Mon Sep 17 00:00:00 2001 From: Carlos Abraham Date: Fri, 25 Jan 2019 14:26:32 -0500 Subject: [PATCH 4/4] prototyping fuction fix --- .gitignore | 3 +-- cli.c | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index f3c567e..416bc3b 100644 --- a/.gitignore +++ b/.gitignore @@ -6,5 +6,4 @@ *.gcno binary test -example -deps/ \ No newline at end of file +deps/ diff --git a/cli.c b/cli.c index d3e9f44..b746faf 100644 --- a/cli.c +++ b/cli.c @@ -15,8 +15,8 @@ #define VERSION "1.0.4" -const char -*show_help() { +const char* +show_help(void) { return "\n\ An small library to work with binary numbers\n\n\ Usage:\n\n\