git: avoid uninterruptible temporary warning

dont' fall into the rathole.

diff --git a/sys/src/cmd/git/pack.c b/sys/src/cmd/git/pack.c
index 893e4cd851377b5d66b3f035bb280e7fb24d38ef..12215bdcd416db23e72847edb1bad799d0b0242b 100644 (file)
--- a/sys/src/cmd/git/pack.c
+++ b/sys/src/cmd/git/pack.c
@@ -1000,7 +1000,8 @@ readidxobject(Biobuf *idx, Hash h, int flag)
        retried = 0;
 retry:
        for(i = 0; i < npackf; i++){
-               if((o = searchindex(packf[i].idx, packf[i].nidx, h)) != -1){
+               o = searchindex(packf[i].idx, packf[i].nidx, h);
+               if(o != -1){
                        if((f = openpack(&packf[i])) == nil)
                                goto error;
                        if((r = Bseek(f, o, 0)) != -1)

diff --git a/sys/src/cmd/git/save.c b/sys/src/cmd/git/save.c
index 5275817baa6f27c17cd2cc634c71bf984864eef0..a9f0f51621645e78989304b111c2c633955e063a 100644 (file)
--- a/sys/src/cmd/git/save.c
+++ b/sys/src/cmd/git/save.c
@@ -350,7 +350,6 @@ main(int argc, char **argv)
        vlong date;
        Object *t;
 
-       gitinit();
        gitinit();
        if(access(".git", AEXIST) != 0)
                sysfatal("could not find git repo: %r");

diff --git a/sys/src/cmd/git/util.c b/sys/src/cmd/git/util.c
index 206175106306cf459e885af0644b18f9e0113b62..5ae897d3a4b1a23fef41ca727567f857c5f25cd7 100644 (file)
--- a/sys/src/cmd/git/util.c
+++ b/sys/src/cmd/git/util.c
@@ -67,7 +67,8 @@ eamalloc(ulong n, ulong sz)
        uvlong na;
        void *v;
 
-       if((na = (uvlong)n*(uvlong)sz) >= (1ULL<<30))
+       na = (uvlong)n*(uvlong)sz;
+       if(na >= (1ULL<<30))
                sysfatal("alloc: overflow");
        v = mallocz(na, 1);
        if(v == nil)
@@ -94,7 +95,8 @@ earealloc(void *p, ulong n, ulong sz)
        uvlong na;
        void *v;
 
-       if((na = (uvlong)n*(uvlong)sz) >= (1ULL<<30))
+       na = (uvlong)n*(uvlong)sz;
+       if(na >= (1ULL<<30))
                sysfatal("alloc: overflow");
        v = realloc(p, na);
        if(v == nil)