1 --- poldek-cvs20040323/pkgdir_digest.c.orig 2002-05-15 17:53:22.000000000 +0200
2 +++ poldek-cvs20040323/pkgdir_digest.c 2004-04-24 23:39:17.927522138 +0200
5 int hdr_digest(FILE *stream, unsigned char *md, int *md_size, EVP_MD_CTX *_ctx)
7 - int line_size = 0, nread, len, endvhdr_found = 0;
8 + size_t line_size = 0;
9 + int nread, len, endvhdr_found = 0;
10 unsigned char buf[256];
13 --- poldek-cvs20040323/trurlib/n_array_dump_stats.c.orig 2000-10-29 22:12:21.000000000 +0100
14 +++ poldek-cvs20040323/trurlib/n_array_dump_stats.c 2004-04-24 23:45:50.159356575 +0200
16 void n_array_dump_stats(const tn_array *arr, const char *name)
19 - printf("\nArray \"%s\" [memsize, items, start_index] = %d, %d, %d\n",
20 + printf("\nArray \"%s\" [memsize, items, start_index] = %zd, %zd, %zd\n",
21 name ? name : "", arr->allocated, arr->items, arr->start_index);
23 --- poldek-cvs20040323/trurlib/n_hash_stats.c.orig 2000-10-29 22:12:21.000000000 +0100
24 +++ poldek-cvs20040323/trurlib/n_hash_stats.c 2004-04-24 23:47:50.222234706 +0200
29 - printf("%p %d items, %d emptys, %d collisions, maxdeep %d\n", ht,
30 + printf("%p %zd items, %d emptys, %d collisions, maxdeep %d\n", ht,
31 ht->items, nempts, ncolls, maxdeep);
34 --- poldek-cvs20040323/trurlib/nstr_tokl.c.orig 2003-04-30 17:53:02.000000000 +0200
35 +++ poldek-cvs20040323/trurlib/nstr_tokl.c 2004-04-24 23:48:43.078415374 +0200
44 --- poldek-cvs20040323/vfile/vhttp/test_vhttp.c.orig 2002-04-08 19:21:37.000000000 +0200
45 +++ poldek-cvs20040323/vfile/vhttp/test_vhttp.c 2004-04-24 23:52:37.708518571 +0200
52 --- poldek-cvs20040323/pkgdir.c.orig 2004-03-11 00:27:42.000000000 +0100
53 +++ poldek-cvs20040323/pkgdir.c 2004-04-24 23:57:45.955765417 +0200
58 - int line_size = 0, nread, nerr = 0, rc;
59 + size_t line_size = 0;
60 + int nread, nerr = 0, rc;
61 const char *errmsg_broken_difftoc = _("%s: broken patch list");
62 char current_mdd[PDIGEST_SIZE + 1];
63 struct pdigest pdg_current;
65 struct pkgdir *pkgdir = NULL;
68 - int line_size, nline;
72 struct pkgroup_idx *pkgroups = NULL;
73 time_t ts = 0, ts_orig = 0;
75 struct pkgtags_s pkgt;
80 int nerr = 0, nread, i;
82 int flag_skip_bastards = 0, flag_fullflist = 0;
83 --- poldek-cvs20040323/rpm_signature.c.orig 2003-07-16 12:49:28.000000000 +0200
84 +++ poldek-cvs20040323/rpm_signature.c 2004-04-25 00:04:20.178184651 +0200
91 +/* from internal lib/signature.h, no public prototype (at least in 4.3 snaps) */
92 +typedef enum sigType_e {
93 + RPMSIGTYPE_HEADERSIG= 5 /*!< Header style signature */
95 +rpmRC rpmReadSignature(FD_t fd, Header *sighp, sigType sig_type, const char ** msg);
97 +rpmRC readLead(FD_t fd, /*@out@*/ struct rpmlead *lead);
100 static int rpm_read_signature(FD_t fd, Header *sighp, int sig_type)