blame: avoid -lm by not using log().

... as suggested on the list.

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Makefile b/Makefile
index eb1887d7718a631fb72fddc1f42f94318d68e9aa..b6d8804d4b0cac60d1dd4943c5b9a791f26e006f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -534,10 +534,6 @@ git-rev-list$X: rev-list.o $(LIB_FILE)
        $(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
                $(LIBS) $(OPENSSL_LIBSSL)
 
        $(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
                $(LIBS) $(OPENSSL_LIBSSL)
 

-git-blame$X: blame.o $(LIB_FILE)
-       $(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
-               $(LIBS) -lm
-

 init-db.o: init-db.c
        $(CC) -c $(ALL_CFLAGS) \
                -DDEFAULT_GIT_TEMPLATE_DIR='"$(template_dir_SQ)"' $*.c
 init-db.o: init-db.c
        $(CC) -c $(ALL_CFLAGS) \
                -DDEFAULT_GIT_TEMPLATE_DIR='"$(template_dir_SQ)"' $*.c

diff --git a/blame.c b/blame.c
index 168b1f5fe5555b9e0697f211fb10859dbef327a3..b551dd5aa3b2af1ef4d5c2870f18ba4900d50d22 100644 (file)
--- a/blame.c
+++ b/blame.c
@@ -589,7 +589,7 @@ int main(int argc, const char **argv)
                                usage(blame_usage);
                        else if(!strcmp(argv[i], "-l") ||
                                !strcmp(argv[i], "--long")) {
                                usage(blame_usage);
                        else if(!strcmp(argv[i], "-l") ||
                                !strcmp(argv[i], "--long")) {

-                               sha1_len = 20;
+                               sha1_len = 40;

                                continue;
                        } else if(!strcmp(argv[i], "-c") ||
                                  !strcmp(argv[i], "--compability")) {
                                continue;
                        } else if(!strcmp(argv[i], "-c") ||
                                  !strcmp(argv[i], "--compability")) {


@@ -651,7 +651,9 @@ int main(int argc, const char **argv)
        process_commits(&rev, filename, &initial);
 
        buf = blame_contents;
        process_commits(&rev, filename, &initial);
 
        buf = blame_contents;

-       max_digits = 1 + log(num_blame_lines+1)/log(10);
+       for (max_digits = 1, i = 10; i <= num_blame_lines + 1; max_digits++)
+               i *= 10;
+

        for (i = 0; i < num_blame_lines; i++) {
                struct commit *c = blame_lines[i];
                if (!c)
        for (i = 0; i < num_blame_lines; i++) {
                struct commit *c = blame_lines[i];
                if (!c)