ifix warning with libgit2 v0.99+, remain compatible with older versions - stagit-gopher - A git gopher frontend. (mirror) Err bitreich.org 70
hgit clone git://bitreich.org/stagit-gopher/ git://enlrupgkhuxnvlhsf6lc3fziv5h2hhfrinws65d7roiv6bfj7d652fid.onion/stagit-gopher/ URL:git://bitreich.org/stagit-gopher/ git://enlrupgkhuxnvlhsf6lc3fziv5h2hhfrinws65d7roiv6bfj7d652fid.onion/stagit-gopher/ bitreich.org 70
1Log /scm/stagit-gopher/log.gph bitreich.org 70
1Files /scm/stagit-gopher/files.gph bitreich.org 70
1Refs /scm/stagit-gopher/refs.gph bitreich.org 70
1Tags /scm/stagit-gopher/tag bitreich.org 70
1README /scm/stagit-gopher/file/README.gph bitreich.org 70
1LICENSE /scm/stagit-gopher/file/LICENSE.gph bitreich.org 70
i--- Err bitreich.org 70
1commit 70e0e50a6c4d83f7b809be4338bcf2868c13b49b /scm/stagit-gopher/commit/70e0e50a6c4d83f7b809be4338bcf2868c13b49b.gph bitreich.org 70
1parent f1c1f8c810b311b9f786847dda2494c397cc1ddf /scm/stagit-gopher/commit/f1c1f8c810b311b9f786847dda2494c397cc1ddf.gph bitreich.org 70
hAuthor: Hiltjo Posthuma <hiltjo@codemadness.org> URL:mailto:hiltjo@codemadness.org bitreich.org 70
iDate: Sun, 6 Dec 2020 17:20:42 +0100 Err bitreich.org 70
i Err bitreich.org 70
ifix warning with libgit2 v0.99+, remain compatible with older versions Err bitreich.org 70
i Err bitreich.org 70
igit_blob_rawsize now returns with git_object_size_t (unsigned). This was Err bitreich.org 70
igit_off_t (signed). Err bitreich.org 70
i Err bitreich.org 70
iIn my current version 1.1.0: Err bitreich.org 70
i types.h:typedef uint64_t git_object_size_t; Err bitreich.org 70
i Err bitreich.org 70
iv0.28.5: Err bitreich.org 70
ihttps://libgit2.org/libgit2/#v0.28.5/group/blob/git_blob_rawsize Err bitreich.org 70
i Err bitreich.org 70
ichanged from v0.99 onwards: Err bitreich.org 70
ihttps://libgit2.org/libgit2/#v0.99.0/group/blob/git_blob_rawsize Err bitreich.org 70
i Err bitreich.org 70
iFix: use size_t to remain compatible (with a possible warning in older Err bitreich.org 70
iversions), since git_object_size_t is a new defined type. Err bitreich.org 70
iThis assumes size_t is atleast uint32_t / uint64_t size. Err bitreich.org 70
i Err bitreich.org 70
iAdapted from a patch by Augustin Fabre <augustin@augfab.fr>, thanks! Err bitreich.org 70
i Err bitreich.org 70
iDiffstat: Err bitreich.org 70
i M stagit-gopher.c | 15 +++++++-------- Err bitreich.org 70
i Err bitreich.org 70
i1 file changed, 7 insertions(+), 8 deletions(-) Err bitreich.org 70
i--- Err bitreich.org 70
1diff --git a/stagit-gopher.c b/stagit-gopher.c /scm/stagit-gopher/file/stagit-gopher.c.gph bitreich.org 70
i@@ -597,13 +597,13 @@ writefooter(FILE *fp) Err bitreich.org 70
i size_t Err bitreich.org 70
i writeblobgph(FILE *fp, const git_blob *blob) Err bitreich.org 70
i { Err bitreich.org 70
i- size_t n = 0, i, j, prev; Err bitreich.org 70
i+ size_t n = 0, i, j, len, prev; Err bitreich.org 70
i const char *nfmt = "%6zu "; Err bitreich.org 70
i const char *s = git_blob_rawcontent(blob); Err bitreich.org 70
i- git_off_t len = git_blob_rawsize(blob); Err bitreich.org 70
i Err bitreich.org 70
i+ len = git_blob_rawsize(blob); Err bitreich.org 70
i if (len > 0) { Err bitreich.org 70
i- for (i = 0, prev = 0; i < (size_t)len; i++) { Err bitreich.org 70
i+ for (i = 0, prev = 0; i < len; i++) { Err bitreich.org 70
i if (s[i] != '\n') Err bitreich.org 70
i continue; Err bitreich.org 70
i n++; Err bitreich.org 70
i@@ -969,7 +969,7 @@ writeatom(FILE *fp, int all) Err bitreich.org 70
i } Err bitreich.org 70
i Err bitreich.org 70
i size_t Err bitreich.org 70
i-writeblob(git_object *obj, const char *fpath, const char *filename, git_off_t filesize) Err bitreich.org 70
i+writeblob(git_object *obj, const char *fpath, const char *filename, size_t filesize) Err bitreich.org 70
i { Err bitreich.org 70
i char tmp[PATH_MAX] = "", *d; Err bitreich.org 70
i size_t lc = 0; Err bitreich.org 70
i@@ -986,7 +986,7 @@ writeblob(git_object *obj, const char *fpath, const char *filename, git_off_t fi Err bitreich.org 70
i writeheader(fp, filename); Err bitreich.org 70
i fputc('t', fp); Err bitreich.org 70
i gphtext(fp, filename, strlen(filename)); Err bitreich.org 70
i- fprintf(fp, " (%juB)\n", (uintmax_t)filesize); Err bitreich.org 70
i+ fprintf(fp, " (%zuB)\n", filesize); Err bitreich.org 70
i fputs("---\n", fp); Err bitreich.org 70
i Err bitreich.org 70
i if (git_blob_is_binary((git_blob *)obj)) { Err bitreich.org 70
i@@ -1049,10 +1049,9 @@ writefilestree(FILE *fp, git_tree *tree, const char *path) Err bitreich.org 70
i { Err bitreich.org 70
i const git_tree_entry *entry = NULL; Err bitreich.org 70
i git_object *obj = NULL; Err bitreich.org 70
i- git_off_t filesize; Err bitreich.org 70
i const char *entryname; Err bitreich.org 70
i char buf[256], filepath[PATH_MAX], entrypath[PATH_MAX], oid[8]; Err bitreich.org 70
i- size_t count, i, lc; Err bitreich.org 70
i+ size_t count, i, lc, filesize; Err bitreich.org 70
i int r, ret; Err bitreich.org 70
i Err bitreich.org 70
i count = git_tree_entrycount(tree); Err bitreich.org 70
i@@ -1096,7 +1095,7 @@ writefilestree(FILE *fp, git_tree *tree, const char *path) Err bitreich.org 70
i if (lc > 0) Err bitreich.org 70
i fprintf(fp, "%7zuL", lc); Err bitreich.org 70
i else Err bitreich.org 70
i- fprintf(fp, "%7juB", (uintmax_t)filesize); Err bitreich.org 70
i+ fprintf(fp, "%7zuB", filesize); Err bitreich.org 70
i fprintf(fp, "|%s/", relpath); Err bitreich.org 70
i gphlink(fp, filepath, strlen(filepath)); Err bitreich.org 70
i fputs("|server|port]\n", fp); Err bitreich.org 70
.
Response:
text/plain