Re: [RFC/PATCH] fast-import: Fix compile warnings
From: Shawn O. Pearce <hidden>
Date: 2016-06-15 22:42:53
Johannes Schindelin [off-list ref] wrote:
Not on all platforms are size_t and unsigned long equivalent. Since I do not know how portable %z is, I play safe, and just cast the respective variables to unsigned long.
We do this elsewhere in Git. blobs are using unsigned long in sha1_file.c for their length; I chose to size_t in gfi as that's what the type is for... but then look at the mess. I applied this patch to my tree and pushed it to repo.or.cz. This last hunk:
quoted hunk ↗ jump to hunk
@@ -2028,7 +2030,8 @@ int main(int argc, const char **argv) fprintf(stderr, " marks: %10ju (%10ju unique )\n", (((uintmax_t)1) << marks->shift) * 1024, marks_set_count); fprintf(stderr, " atoms: %10u\n", atom_cnt); fprintf(stderr, "Memory total: %10ju KiB\n", (total_allocd + alloc_count*sizeof(struct object_entry))/1024); - fprintf(stderr, " pools: %10lu KiB\n", total_allocd/1024); + fprintf(stderr, " pools: %10lu KiB\n", + (unsigned long)(total_allocd / 1024)); fprintf(stderr, " objects: %10ju KiB\n", (alloc_count*sizeof(struct object_entry))/1024); fprintf(stderr, "---------------------------------------------------------------------\n"); pack_report();
was the only part that did not apply cleanly, but that was easily fixed by tossing an extra tab at the start of each line, as this hunk was shifted in one level by a recent commit that Junio has not pushed out to master. -- Shawn.