From 92743e0999d76246431a15ec835f62e86fd141ca Mon Sep 17 00:00:00 2001 From: Peter Howkins Date: Sat, 1 Sep 2012 20:54:23 +0100 Subject: [PATCH] libDtSearch: Resolve 26 compiler warnings. --- cde/lib/DtSearch/boolpars.c | 12 ++++++------ cde/lib/DtSearch/dtsrutil.c | 6 +++--- cde/lib/DtSearch/opendblk.c | 2 +- cde/lib/DtSearch/raima/dio.c | 10 +++++----- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/cde/lib/DtSearch/boolpars.c b/cde/lib/DtSearch/boolpars.c index d2c7f583..0e1146ee 100644 --- a/cde/lib/DtSearch/boolpars.c +++ b/cde/lib/DtSearch/boolpars.c @@ -322,7 +322,7 @@ static TRUTHTAB *get_stem_truthtab (char *newstem, char *origword) (saveusr.stems[stemno][0] == STEM_CH) ? '~' : saveusr.stems[stemno][0], &saveusr.stems[stemno][1], - newtt, newtt->pmsz); + (void *) newtt, newtt->pmsz); fflush (aa_stderr); } return newtt; @@ -364,7 +364,7 @@ TRUTHTAB *boolyac_AND (TRUTHTAB *tt1, TRUTHTAB *tt2) { newtt = creatett (-1, newpm, new_permutes); if (debugging_boolpars) { fprintf (aa_stderr, " AND: exprs=%p,%p-->expr=%p pmsz=%d\n", - tt1, tt2, newtt, newtt->pmsz); + (void *) tt1, (void *) tt2, (void *) newtt, newtt->pmsz); fflush (aa_stderr); } return newtt; @@ -413,7 +413,7 @@ TRUTHTAB *boolyac_OR (TRUTHTAB *tt1, TRUTHTAB *tt2) { newtt = creatett (-1, newpm, new_permutes); if (debugging_boolpars) { fprintf (aa_stderr, " OR: exprs=%p,%p-->expr=%p pmsz=%d\n", - tt1, tt2, newtt, newtt->pmsz); + (void *) tt1, (void *) tt2, (void *) newtt, newtt->pmsz); fflush (aa_stderr); } return newtt; @@ -455,7 +455,7 @@ TRUTHTAB *boolyac_NOT (TRUTHTAB *oldtt) { newtt = creatett (-1, newpm, new_permutes); if (debugging_boolpars) { fprintf (aa_stderr, " NOT: expr=%p-->expr=%p pmsz=%d\n", - oldtt, newtt, newtt->pmsz); + (void *) oldtt, (void *) newtt, newtt->pmsz); fflush (aa_stderr); } return newtt; @@ -513,7 +513,7 @@ TRUTHTAB *boolyac_COLLOC ( freett (word2tt); if (debugging_boolpars) { fprintf (aa_stderr, " COLLOC: exprs=%p,%p-->expr=%p pmsz=%d\n", - word1tt, word2tt, newtt, newtt->pmsz); + (void *) word1tt, (void *) word2tt, (void *) newtt, newtt->pmsz); fflush (aa_stderr); } return newtt; @@ -825,7 +825,7 @@ DELIVER_TOKEN: fprintf (aa_stderr, " yylex: op?=%d parct=%d tok#=%d lval=%p%sYYTEXT='%s'\n", last_token_was_boolop, paren_count, - retn_token, yylval.truthtab, + retn_token, (void *) yylval.truthtab, (retn_token == COLLOC_TOKEN)? "\t\t" : "\t", yytext); fflush (aa_stderr); diff --git a/cde/lib/DtSearch/dtsrutil.c b/cde/lib/DtSearch/dtsrutil.c index 33569c8c..aa8d3fc2 100644 --- a/cde/lib/DtSearch/dtsrutil.c +++ b/cde/lib/DtSearch/dtsrutil.c @@ -124,7 +124,7 @@ void print_dittolist (DtSrResult * dittolist, char *prefix) return; } fprintf (aa_stderr, "%s First %d hits on dittolist at %p:\n", - prefix, maxcount, dittolist); + prefix, maxcount, (void *) dittolist); for (dit = dittolist; dit != NULL && maxcount-- > 0; dit = dit->link) { if (dit->objdate == 0) strcpy (datebuf, "0"); @@ -248,11 +248,11 @@ void print_usrblk_record (char *prefix) prefix, (long)usrblk.dba >> 24, (long)usrblk.dba & 0xffffffL, usrblk.objrec.or_objkey, - usrblk.notes, + (void *) usrblk.notes, (int)usrblk.clearlen, NULLORSTR (usrblk.cleartext), (int)usrblk.hitwcount, - usrblk.hitwords, + (void *) usrblk.hitwords, NULLORSTR (usrblk.abstrbuf)); return; } /* print_usrblk_record() */ diff --git a/cde/lib/DtSearch/opendblk.c b/cde/lib/DtSearch/opendblk.c index 1d95aa83..347ef08d 100644 --- a/cde/lib/DtSearch/opendblk.c +++ b/cde/lib/DtSearch/opendblk.c @@ -154,7 +154,7 @@ BAD_INPUT: *targptr = 0; fprintf (aa_stderr, "--> DBLK at %p link=%p name='%s' maxhits=%d\n" " keytypes='%s', path='%s'\n", - db, db->link, db->name, db->maxhits, + (void *) db, (void *) db->link, db->name, db->maxhits, sprintbuf, NULLORSTR (db->path)); } } diff --git a/cde/lib/DtSearch/raima/dio.c b/cde/lib/DtSearch/raima/dio.c index aa3258c9..57e2d3a8 100644 --- a/cde/lib/DtSearch/raima/dio.c +++ b/cde/lib/DtSearch/raima/dio.c @@ -348,7 +348,7 @@ dio_init() #ifdef DEBUG_DIO if (debugging_dio_init) { printf (__FILE__"300 dio_init: dbpgtab=%p pgsz=%d largest=%d\n", - dbpg_table, (int)page_size, (int)largest_page); + (void *) dbpg_table, (int)page_size, (int)largest_page); fflush(stdout); } #endif @@ -392,7 +392,7 @@ dio_init() #ifdef DEBUG_DIO if (debugging_dio_init) { printf (__FILE__"345 dio_init: usedfls=%p lookup=%p pgtab=%p\n", - used_files, db_lookup, dbpg_table); + (void *) used_files, (void *) db_lookup, (void *) dbpg_table); fflush(stdout); } #endif @@ -462,7 +462,7 @@ int pgsize; #ifdef DEBUG_DIO if (debugging_dio_init) { printf (__FILE__"400 cache_init: pgcnt=%d lu=%p pgp=%p pgsz=%d\n", - pg_cnt, lu_ptr, pg_ptr, pgsize); + pg_cnt, (void *) lu_ptr, (void *) pg_ptr, pgsize); fflush(stdout); } #endif @@ -712,7 +712,7 @@ int dio_flush() #ifdef DEBUG_DIO if (debugging_dio_close) { printf (__FILE__"685 dio_flush: check cache dbpgtab=%p count=%d\n", - dbpg_table, (int)db_pgtab_sz); + (void *) dbpg_table, (int)db_pgtab_sz); fflush(stdout); } #endif @@ -750,7 +750,7 @@ int dio_flush() #ifdef DEBUG_DIO if (debugging_dio_close) { printf (__FILE__"723 dio_flush: write modified pg#%d @ %p\n", - db_pgtab_sz - pgt_lc, pg_ptr); + db_pgtab_sz - pgt_lc, (void *) pg_ptr); fflush(stdout); } #endif -- 2.25.1