head 1.1; access; symbols pkgsrc-2026Q1:1.1.0.118 pkgsrc-2026Q1-base:1.1 pkgsrc-2025Q4:1.1.0.116 pkgsrc-2025Q4-base:1.1 pkgsrc-2025Q3:1.1.0.114 pkgsrc-2025Q3-base:1.1 pkgsrc-2025Q2:1.1.0.112 pkgsrc-2025Q2-base:1.1 pkgsrc-2025Q1:1.1.0.110 pkgsrc-2025Q1-base:1.1 pkgsrc-2024Q4:1.1.0.108 pkgsrc-2024Q4-base:1.1 pkgsrc-2024Q3:1.1.0.106 pkgsrc-2024Q3-base:1.1 pkgsrc-2024Q2:1.1.0.104 pkgsrc-2024Q2-base:1.1 pkgsrc-2024Q1:1.1.0.102 pkgsrc-2024Q1-base:1.1 pkgsrc-2023Q4:1.1.0.100 pkgsrc-2023Q4-base:1.1 pkgsrc-2023Q3:1.1.0.98 pkgsrc-2023Q3-base:1.1 pkgsrc-2023Q2:1.1.0.96 pkgsrc-2023Q2-base:1.1 pkgsrc-2023Q1:1.1.0.94 pkgsrc-2023Q1-base:1.1 pkgsrc-2022Q4:1.1.0.92 pkgsrc-2022Q4-base:1.1 pkgsrc-2022Q3:1.1.0.90 pkgsrc-2022Q3-base:1.1 pkgsrc-2022Q2:1.1.0.88 pkgsrc-2022Q2-base:1.1 pkgsrc-2022Q1:1.1.0.86 pkgsrc-2022Q1-base:1.1 pkgsrc-2021Q4:1.1.0.84 pkgsrc-2021Q4-base:1.1 pkgsrc-2021Q3:1.1.0.82 pkgsrc-2021Q3-base:1.1 pkgsrc-2021Q2:1.1.0.80 pkgsrc-2021Q2-base:1.1 pkgsrc-2021Q1:1.1.0.78 pkgsrc-2021Q1-base:1.1 pkgsrc-2020Q4:1.1.0.76 pkgsrc-2020Q4-base:1.1 pkgsrc-2020Q3:1.1.0.74 pkgsrc-2020Q3-base:1.1 pkgsrc-2020Q2:1.1.0.70 pkgsrc-2020Q2-base:1.1 pkgsrc-2020Q1:1.1.0.50 pkgsrc-2020Q1-base:1.1 pkgsrc-2019Q4:1.1.0.72 pkgsrc-2019Q4-base:1.1 pkgsrc-2019Q3:1.1.0.68 pkgsrc-2019Q3-base:1.1 pkgsrc-2019Q2:1.1.0.66 pkgsrc-2019Q2-base:1.1 pkgsrc-2019Q1:1.1.0.64 pkgsrc-2019Q1-base:1.1 pkgsrc-2018Q4:1.1.0.62 pkgsrc-2018Q4-base:1.1 pkgsrc-2018Q3:1.1.0.60 pkgsrc-2018Q3-base:1.1 pkgsrc-2018Q2:1.1.0.58 pkgsrc-2018Q2-base:1.1 pkgsrc-2018Q1:1.1.0.56 pkgsrc-2018Q1-base:1.1 pkgsrc-2017Q4:1.1.0.54 pkgsrc-2017Q4-base:1.1 pkgsrc-2017Q3:1.1.0.52 pkgsrc-2017Q3-base:1.1 pkgsrc-2017Q2:1.1.0.48 pkgsrc-2017Q2-base:1.1 pkgsrc-2017Q1:1.1.0.46 pkgsrc-2017Q1-base:1.1 pkgsrc-2016Q4:1.1.0.44 pkgsrc-2016Q4-base:1.1 pkgsrc-2016Q3:1.1.0.42 pkgsrc-2016Q3-base:1.1 pkgsrc-2016Q2:1.1.0.40 pkgsrc-2016Q2-base:1.1 pkgsrc-2016Q1:1.1.0.38 pkgsrc-2016Q1-base:1.1 pkgsrc-2015Q4:1.1.0.36 pkgsrc-2015Q4-base:1.1 pkgsrc-2015Q3:1.1.0.34 pkgsrc-2015Q3-base:1.1 pkgsrc-2015Q2:1.1.0.32 pkgsrc-2015Q2-base:1.1 pkgsrc-2015Q1:1.1.0.30 pkgsrc-2015Q1-base:1.1 pkgsrc-2014Q4:1.1.0.28 pkgsrc-2014Q4-base:1.1 pkgsrc-2014Q3:1.1.0.26 pkgsrc-2014Q3-base:1.1 pkgsrc-2014Q2:1.1.0.24 pkgsrc-2014Q2-base:1.1 pkgsrc-2014Q1:1.1.0.22 pkgsrc-2014Q1-base:1.1 pkgsrc-2013Q4:1.1.0.20 pkgsrc-2013Q4-base:1.1 pkgsrc-2013Q3:1.1.0.18 pkgsrc-2013Q3-base:1.1 pkgsrc-2013Q2:1.1.0.16 pkgsrc-2013Q2-base:1.1 pkgsrc-2013Q1:1.1.0.14 pkgsrc-2013Q1-base:1.1 pkgsrc-2012Q4:1.1.0.12 pkgsrc-2012Q4-base:1.1 pkgsrc-2012Q3:1.1.0.10 pkgsrc-2012Q3-base:1.1 pkgsrc-2012Q2:1.1.0.8 pkgsrc-2012Q2-base:1.1 pkgsrc-2012Q1:1.1.0.6 pkgsrc-2012Q1-base:1.1 pkgsrc-2011Q4:1.1.0.4 pkgsrc-2011Q4-base:1.1 pkgsrc-2011Q3:1.1.0.2 pkgsrc-2011Q3-base:1.1; locks; strict; comment @# @; 1.1 date 2011.08.28.22.30.17; author dholland; state Exp; branches; next ; desc @@ 1.1 log @Fix void main. While here: - add various LP64 fixes; - use stdlib.h as needed instead of casting the return value of malloc; - fix fake-varargs printf code and use stdarg.h; - use system snprintf instead of included custom one; - tidy up symbol name conflict with log(); - add patch comments; - remove some pkglint; - add LICENSE. PKGREVISION -> 2. @ text @$NetBSD$ - needs stdlib.h instead of casting return value of malloc - other LP64 fixes --- db.c.orig 2011-08-28 21:43:47.000000000 +0000 +++ db.c @@@@ -31,6 +31,8 @@@@ static char *_db_c_ident_ = "@@(#)$Id: db #include #include #include +#include +#include #include "list.h" #include "cddbd.h" #include "patchlevel.h" @@@@ -109,7 +111,7 @@@@ list_init(void *data, int (*comp_func)(v { lhead_t *lh; - lh = (lhead_t *)malloc(sizeof(lhead_t)); + lh = malloc(sizeof(lhead_t)); if(lh == 0) return 0; @@@@ -159,9 +161,9 @@@@ list_find(lhead_t *lh, void *data) else if(cmp > 0) return 0; } - else if((unsigned int)lp->l_data == (unsigned int)data) + else if((uintptr_t)lp->l_data == (uintptr_t)data) return lp; - else if((unsigned int)lp->l_data > (unsigned int)data) + else if((uintptr_t)lp->l_data > (uintptr_t)data) return 0; } @@@@ -704,14 +706,14 @@@@ cddbd_check_db(int level, int fix) islink = 0; if(sbuf.st_nlink > 1) { - if(list_find(lh, (void *)(int)sbuf.st_ino) + if(list_find(lh, (void *)(uintptr_t)sbuf.st_ino) != 0) { links++; islink++; continue; } else if(list_add_cur(lh, - (void *)(int)sbuf.st_ino) == 0) { + (void *)(uintptr_t)sbuf.st_ino) == 0) { cddbd_log(LOG_ERR, "Can't malloc linked list entry."); quit(QUIT_ERR); @@@@ -803,11 +805,11 @@@@ cddbd_check_db(int level, int fix) post = 0; if(!list_find(db->db_phase[DP_DISCID], - (void *)discid)) { + (void *)(uintptr_t)discid)) { /* Add the discid to the entry. */ if(!list_add_cur( db->db_phase[DP_DISCID], - (void *)discid)) { + (void *)(uintptr_t)discid)) { cddbd_log(LOG_ERR, "Can't malloc list entry"); @@@@ -857,7 +859,7 @@@@ cddbd_check_db(int level, int fix) else { /* Make sure discid is in the DB entry. */ if(!list_find(db->db_phase[DP_DISCID], - (void *)discid)) { + (void *)(uintptr_t)discid)) { cddbd_log(LOG_ERR, "Warning: DB entry %s missing %s", parstab[DP_DISCID].dp_name, @@@@ -1232,7 +1234,7 @@@@ db_read(FILE *fp, char *errstr, int flag return 0; } - if(list_find(lh, (void *)discid) != 0) { + if(list_find(lh, (void *)(uintptr_t)discid) != 0) { cddbd_snprintf(errstr, CDDBBUFSIZ, "duplicate disc ID on line %d", line); @@@@ -1241,7 +1243,7 @@@@ db_read(FILE *fp, char *errstr, int flag return 0; } - if(list_add_cur(lh, (void *)discid) == 0) { + if(list_add_cur(lh, (void *)(uintptr_t)discid) == 0) { cddbd_snprintf(errstr, CDDBBUFSIZ, "can't malloc list entry"); @@@@ -1642,7 +1644,7 @@@@ db_read(FILE *fp, char *errstr, int flag /* Ensure the discid is in the DB entry. */ discid = db_gen_discid(db); - if(list_find(db->db_phase[DP_DISCID], (void *)discid) == 0) { + if(list_find(db->db_phase[DP_DISCID], (void *)(uintptr_t)discid) == 0) { cddbd_snprintf(errstr, CDDBBUFSIZ, "disc ID generated from track offsets (%08x) not found " "in %s", discid, parstab[DP_DISCID].dp_name); @@@@ -1659,7 +1661,7 @@@@ db_read(FILE *fp, char *errstr, int flag for(; !list_rewound(lh); list_forw(lh)) { lp = list_cur(lh); - discid = (unsigned int)lp->l_data; + discid = (unsigned int)(uintptr_t)lp->l_data; if((discid & 0xFF) != db->db_trks) { cddbd_snprintf(errstr, CDDBBUFSIZ, @@@@ -1738,7 +1740,7 @@@@ db_write_num(FILE *fp, lhead_t *lh, db_p if(!(i % n) && fputs(dp->dp_pstr, fp) == EOF) return 0; - if(fprintf(fp, "%08x", (unsigned int)lp->l_data) == EOF) + if(fprintf(fp, "%08lx", (unsigned long)(uintptr_t)lp->l_data) == EOF) return 0; if(i == (list_count(lh) - 1) || !((i + 1) % n)) @@@@ -1783,7 +1785,7 @@@@ db_post(db_t *db, char *dir, unsigned in cddbd_snprintf(name, sizeof(name), "%08x", discid); /* Make sure discid is in the DB entry. */ - if(!list_find(db->db_phase[DP_DISCID], (void *)discid)) { + if(!list_find(db->db_phase[DP_DISCID], (void *)(uintptr_t)discid)) { cddbd_snprintf(errstr, CDDBBUFSIZ, "discid %s is not in the DB entry", name); @@@@ -2124,8 +2126,8 @@@@ db_unlink(char *dir, char *name) list_forw(lh)) { lp = list_cur(lh); - cddbd_snprintf(buf, sizeof(buf), "%s/%08x", - dir, (unsigned int)lp->l_data); + cddbd_snprintf(buf, sizeof(buf), "%s/%08lx", + dir, (unsigned long)(uintptr_t)lp->l_data); unlink(buf); } @@@@ -2157,8 +2159,8 @@@@ db_link(db_t *db, char *dir, char *name, for(list_rewind(lh), list_forw(lh); !list_rewound(lh); list_forw(lh)) { lp = list_cur(lh); - cddbd_snprintf(dblink, sizeof(dblink), "%s/%08x", dir, - (unsigned int)lp->l_data); + cddbd_snprintf(dblink, sizeof(dblink), "%s/%08lx", dir, + (unsigned long)(uintptr_t)lp->l_data); /* This should already exist. */ if(!strcmp(dbname, dblink)) @