From c98e82a4019870417f9ac113e6edaacab779b5c0 Mon Sep 17 00:00:00 2001 From: Peter Howkins Date: Mon, 7 Feb 2022 05:12:35 +0000 Subject: [PATCH] libDtSearch: Resolve format warnings --- cde/lib/DtSearch/boolsrch.c | 4 ++-- cde/lib/DtSearch/hilite.c | 4 ++-- cde/lib/DtSearch/vedelete.c | 2 +- cde/lib/DtSearch/vestatis.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cde/lib/DtSearch/boolsrch.c b/cde/lib/DtSearch/boolsrch.c index e4febaf1c..0425161f6 100644 --- a/cde/lib/DtSearch/boolsrch.c +++ b/cde/lib/DtSearch/boolsrch.c @@ -220,9 +220,9 @@ static int read_recno (long recno) BAD_DBA: if (debugging_boolsrch) { fprintf (aa_stderr, - PROGNAME"434 Invalid dba %ld. " + "%s434 Invalid dba %ld. " "recno=%ld bitvec[%ld]=%02x db_status=%d.\n", - objrecdba, recno, recno>>3, 1<<(recno%8), db_status); + PROGNAME, (long) objrecdba, recno, recno>>3, 1<<(recno%8), db_status); fflush (aa_stderr); } return FALSE; diff --git a/cde/lib/DtSearch/hilite.c b/cde/lib/DtSearch/hilite.c index e75f14960..b8ab1c0af 100644 --- a/cde/lib/DtSearch/hilite.c +++ b/cde/lib/DtSearch/hilite.c @@ -153,8 +153,8 @@ long hilite_cleartext (int parse_type, char *stems, int stemcount) hitwords_size += hitwords_size >> 1; /* 1.5 times */ if (debugging_hilite || (usrblk.debug & USRDBG_RETRVL)) fprintf (aa_stderr, - PROGNAME"098 realloc for %d hitwords.\n", - hitwords_size); + PROGNAME"098 realloc for %ld hitwords.\n", + (long) hitwords_size); hitwords = realloc (hitwords, hitwords_size * sizeof(DtSrHitword) + 16); } diff --git a/cde/lib/DtSearch/vedelete.c b/cde/lib/DtSearch/vedelete.c index 6488f04b3..4cb950159 100644 --- a/cde/lib/DtSearch/vedelete.c +++ b/cde/lib/DtSearch/vedelete.c @@ -444,7 +444,7 @@ NOTHING_TO_DO: CRSET (PROGNAME "178", &dba, vistano); CRREAD (PROGNAME "179", OR_OBJKEY, charbuf, vistano); fprintf (aa_stderr, " #%d\tdba=%ld:%ld key='%s'\n", - i, dba>>24, dba & 0xffffff, charbuf); + i, (long) dba>>24, (long) dba & 0xffffff, charbuf); } } /* Sort the array of database addresses. diff --git a/cde/lib/DtSearch/vestatis.c b/cde/lib/DtSearch/vestatis.c index 038bf7f39..06d2bcfaf 100644 --- a/cde/lib/DtSearch/vestatis.c +++ b/cde/lib/DtSearch/vestatis.c @@ -1090,7 +1090,7 @@ void load_ditto_str (void) if (debugging) fprintf (aa_stderr, " --> dba=%ld normwt=%.4lf prox=%d key='%s'\n", - dba1, sum3, cur_ditto_mem->proximity, + (long) dba1, sum3, cur_ditto_mem->proximity, cur_ditto_mem->reckey); /*