From 7971711fbb50d11525a865b994d191dea41730af Mon Sep 17 00:00:00 2001 From: Benoit Pierre Date: Sun, 4 Oct 2026 13:26:17 +0200 Subject: [PATCH 1/4] willuslib: fix `bmp_crop_ex` initial bitmap copy --- willuslib/bmp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/willuslib/bmp.c b/willuslib/bmp.c index 5c32264..24bb59d 100644 --- a/willuslib/bmp.c +++ b/willuslib/bmp.c @@ -1471,9 +1471,9 @@ void bmp_crop_ex(WILLUSBITMAP *dst,WILLUSBITMAP *src,int x0,int y0_from_top,int dst->type=src->type; dst->bpp=src->bpp; bmp_alloc(dst); - memcpy(dst->red,src->red,256); - memcpy(dst->green,src->green,256); - memcpy(dst->blue,src->blue,256); + memcpy(dst->red,src->red,sizeof(int)*256); + memcpy(dst->green,src->green,sizeof(int)*256); + memcpy(dst->blue,src->blue,sizeof(int)*256); bpr=bmp_bytewidth(dst); for (i=0;i Date: Sun, 4 Oct 2026 13:26:18 +0200 Subject: [PATCH 2/4] willuslib: reduce `WILLUSBITMAP` size Palette RGB entries don't need to be more than 8bits. --- willuslib/bmp.c | 12 ++++++------ willuslib/willus.h | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/willuslib/bmp.c b/willuslib/bmp.c index 24bb59d..66cab14 100644 --- a/willuslib/bmp.c +++ b/willuslib/bmp.c @@ -1471,9 +1471,9 @@ void bmp_crop_ex(WILLUSBITMAP *dst,WILLUSBITMAP *src,int x0,int y0_from_top,int dst->type=src->type; dst->bpp=src->bpp; bmp_alloc(dst); - memcpy(dst->red,src->red,sizeof(int)*256); - memcpy(dst->green,src->green,sizeof(int)*256); - memcpy(dst->blue,src->blue,sizeof(int)*256); + memcpy(dst->red,src->red,256); + memcpy(dst->green,src->green,256); + memcpy(dst->blue,src->blue,256); bpr=bmp_bytewidth(dst); for (i=0;idata,src->data,src->height*bmp_bytewidth(src)); - memcpy(dest->red,src->red,sizeof(int)*256); - memcpy(dest->green,src->green,sizeof(int)*256); - memcpy(dest->blue,src->blue,sizeof(int)*256); + memcpy(dest->red,src->red,256); + memcpy(dest->green,src->green,256); + memcpy(dest->blue,src->blue,256); return(1); } diff --git a/willuslib/willus.h b/willuslib/willus.h index fe49617..2b70dbc 100644 --- a/willuslib/willus.h +++ b/willuslib/willus.h @@ -509,9 +509,9 @@ int arrayf_ifft(float *xr,float *xi,int n); #define WILLUSBITMAP_TYPE_WIN32 1 typedef struct { - int red[256]; - int green[256]; - int blue[256]; + unsigned char red[256]; + unsigned char green[256]; + unsigned char blue[256]; unsigned char *data; /* Top to bottom in native type, bottom to */ /* top in Win32 type. */ int width; /* Width of image in pixels */ From b1576b6dbe15ae4fbc3da4b609a78efdd9b5c80b Mon Sep 17 00:00:00 2001 From: Benoit Pierre Date: Sun, 4 Oct 2026 13:26:20 +0200 Subject: [PATCH 3/4] disable some unused code --- k2pdfoptlib/k2file.c | 2 +- k2pdfoptlib/k2master.c | 8 ++++++++ k2pdfoptlib/k2ocr.c | 11 +++++++---- k2pdfoptlib/k2pdfopt.h | 23 +++++++++++++++++++++++ k2pdfoptlib/k2proc.c | 12 ++++++++++++ k2pdfoptlib/k2settings.c | 20 ++++++++++++++++++-- lib/setting.c | 2 ++ willuslib/filelist.c | 3 +++ willuslib/wsys.c | 11 +++++++++++ 9 files changed, 85 insertions(+), 7 deletions(-) diff --git a/k2pdfoptlib/k2file.c b/k2pdfoptlib/k2file.c index 6d9eec0..44d9d44 100644 --- a/k2pdfoptlib/k2file.c +++ b/k2pdfoptlib/k2file.c @@ -1815,6 +1815,7 @@ void k2file_get_info(char *filename,int *pagelist,char **buf) } } +#if 0 int k2file_get_num_pages(char *filename) @@ -1832,7 +1833,6 @@ int k2file_get_num_pages(char *filename) } -#if 0 void k2file_get_overlay_bitmap(WILLUSBITMAP *bmp,double *dpi,char *filename,char *pagelist) { diff --git a/k2pdfoptlib/k2master.c b/k2pdfoptlib/k2master.c index a649b65..b4eb598 100644 --- a/k2pdfoptlib/k2master.c +++ b/k2pdfoptlib/k2master.c @@ -1647,6 +1647,7 @@ ocrwords_to_easyplot(ocrwords,"postsort.ep",0,NULL); if (k2settings->dst_negative) bmp_invert(bmp); +#if 0 /* Fix colors */ /* if ((k2settings->dst_fgtype!=4 && k2settings->dst_bgtype!=4) @@ -1664,6 +1665,7 @@ ocrwords_to_easyplot(ocrwords,"postsort.ep",0,NULL); k2settings->dst_bgtype, 0,0,bmp->width-1,bmp->height-1); } +#endif /* Write sequence of OCR'd words if debugging */ @@ -2876,8 +2878,10 @@ printf("@k2master_rows_color: %d x %d\n",srcbmp->width,srcbmp->height); printf("region %d: (%d,%d) - (%d,%d)\n",j,subregion->c1,subregion->r1,subregion->c2,subregion->r2); */ bmpregion_find_textrows(subregion,k2settings,0,1,-1.0,0); +#if 0 nfg=k2settings_ncolors(k2settings->dst_fgcolor); nbg=k2settings_ncolors(k2settings->dst_bgcolor); +#endif /* printf("nc=%d, rcindex=%d\n",nc,masterinfo->rcindex); printf("TEXTROWS.n=%d\n",region->textrows.n); @@ -2891,12 +2895,14 @@ printf("TEXTROW[%2d]=%d\n",i,region->textrows.textrow[i].type); textrow=&subregion->textrows.textrow[i]; if (textrow->type==REGION_TYPE_TEXTLINE) { +#if 0 if (k2settings->dst_fgtype==4) strcpy(fgc,k2settings_color_by_index(k2settings->dst_fgcolor, masterinfo->rcindex%nfg)); if (k2settings->dst_bgtype==4) strcpy(bgc,k2settings_color_by_index(k2settings->dst_bgcolor, masterinfo->rcindex%nbg)); +#endif masterinfo->rcindex++; /* For some reason if it's a single text line, need to re-calc bbox. */ /* Should investigate why at some point... */ @@ -2917,6 +2923,7 @@ printf("TEXTROW[%2d]=%d\n",i,region->textrows.textrow[i].type); } } } +#if 0 if (k2settings->dst_fgtype!=4) strcpy(fgc,k2settings->dst_fgcolor); else @@ -2929,6 +2936,7 @@ printf("TEXTROW[%2d]=%d\n",i,region->textrows.textrow[i].type); bmp_change_colors(region->bmp,bmpmask,fgc,k2settings_color_type(fgc), bgc,k2settings_color_type(bgc), 0,0,region->bmp->width-1,region->bmp->height-1); +#endif pageregions_free(pageregions); bmp_free(bmpmask); if (srcbmp->bpp!=8) diff --git a/k2pdfoptlib/k2ocr.c b/k2pdfoptlib/k2ocr.c index 87d2d77..a0aa4a6 100644 --- a/k2pdfoptlib/k2ocr.c +++ b/k2pdfoptlib/k2ocr.c @@ -301,14 +301,14 @@ static void k2ocr_status_line(char *buf,char *color,char *label,char *string) strcat(buf,"\n"); } -#endif - void k2ocr_tesslang_selected(char *lang,int maxlen,K2PDFOPT_SETTINGS *k2settings) { xstrncpy(lang,ocrtess_lang_by_index(k2settings->dst_ocr_lang,0),maxlen); } +#endif + static void k2ocr_tesslang_init(char *lang,int assume_yes) @@ -378,9 +378,9 @@ static void k2ocr_tesslang_init(char *lang,int assume_yes) k2printf(TTEXT_NORMAL " ... download successful." TTEXT_NORMAL "\n"); } } - - +#if 0 + static void *otinit(void *data) { @@ -423,6 +423,9 @@ static void *otinit(void *data) pthread_exit(NULL); return(NULL); } + +#endif + #endif #if 0 diff --git a/k2pdfoptlib/k2pdfopt.h b/k2pdfoptlib/k2pdfopt.h index 0c609f0..4ddf1b0 100644 --- a/k2pdfoptlib/k2pdfopt.h +++ b/k2pdfoptlib/k2pdfopt.h @@ -124,6 +124,11 @@ #endif #endif +#undef HAVE_DJVU_LIB +#undef HAVE_GOCR_LIB +#undef HAVE_MUPDF_LIB +#undef HAVE_OCR_LIB + /* Compile w/Windows GUI? */ #if (defined(HAVE_WIN32_API) && !defined(K2PDFOPT_KINDLEPDFVIEWER)) #define HAVE_K2GUI @@ -266,10 +271,12 @@ typedef struct char show_usage[32]; int src_left_to_right; int src_whitethresh; +#if 0 char dst_fgcolor[MAXFILENAMELEN]; char dst_fgtype; /* 0=none, 1=gray, 2=color, 3=bitmap */ char dst_bgcolor[MAXFILENAMELEN]; char dst_bgtype; /* 0=none, 1=gray, 2=color, 3=bitmap */ +#endif int src_paintwhite; /* Paint everything above src_whitethresh white */ int text_only; /* Do not send figures to output file */ @@ -331,9 +338,11 @@ typedef struct int dst_sharpen; int dst_color; int dst_bpc; +#if 0 int dst_landscape; char dst_landscape_pages[1024]; char dst_opname_format[MAXFILENAMELEN]; +#endif int src_autostraighten; /* double dst_mar; @@ -372,12 +381,14 @@ typedef struct int text_wrap; double word_spacing; /* Negative for auto */ double display_width_inches; /* Device width = dst_width / dst_dpi */ +#if 0 char pagelist[1024]; char pagexlist[1024]; /* exclude these pages */ char bpl[2048]; /* Page break list--see -bpl option */ int use_toc; char toclist[2048]; char tocsavefile[MAXFILENAMELEN]; +#endif int column_fitted; double dpi_org; double contrast_max; @@ -405,7 +416,9 @@ typedef struct /* v2.35--change overlap from int to double */ double src_grid_overlap_percentage; /*int src_grid_order;*/ /* 0=down then across, 1=across then down */ +#if 0 K2CROPBOXES cropboxes; /* Crop boxes */ +#endif K2NOTESET noteset; /* ** Preview options @@ -429,8 +442,10 @@ typedef struct int info; /* 1 = info only about source files */ int pagebreakmark_breakpage_color; /* v2.33, #RRGGBB, 0 = no mark */ int pagebreakmark_nobreak_color; /* v2.33, #RRGGBB, 0 = no mark */ +#if 0 char dst_author[256]; char dst_title[256]; +#endif /* v2.34 */ double dst_fontsize_pts; /* 0=not used */ int assume_yes; /* 1 = assume yes to overwrite */ @@ -992,7 +1007,11 @@ int k2settings_output_is_bitmap(K2PDFOPT_SETTINGS *k2settings); int k2settings_columns_left_to_right(K2PDFOPT_SETTINGS *k2settings); int k2settings_valid_grid_order(K2PDFOPT_SETTINGS *k2settings); K2NOTES *page_has_notes_margin(K2PDFOPT_SETTINGS *k2settings,MASTERINFO *masterinfo); +#if 0 int k2pdfopt_settings_landscape(K2PDFOPT_SETTINGS *k2settings,int pageno,int maxpages); +#else +# define k2pdfopt_settings_landscape(...) 0 +#endif void k2pdfopt_conversion_init(K2PDFOPT_CONVERSION *k2conv); void k2pdfopt_conversion_close(K2PDFOPT_CONVERSION *k2conv); void k2pdfopt_settings_copy(K2PDFOPT_SETTINGS *dst,K2PDFOPT_SETTINGS *src); @@ -1015,9 +1034,13 @@ void k2pdfopt_settings_set_margins_and_devsize(K2PDFOPT_SETTINGS *k2settings, double src_fontsize_pts,int trimmed); char *k2pdfopt_settings_unit_string(int units); void k2pdfopt_settings_clear_cropboxes(K2PDFOPT_SETTINGS *k2settings,int flagmask,int flagtype); +#if 0 void k2cropboxes_init(K2CROPBOXES *cropboxes); int k2cropboxes_count(K2CROPBOXES *cropboxes,int flagmask,int flagtype); int k2settings_has_cropboxes(K2PDFOPT_SETTINGS *k2settings); +#else +# define k2settings_has_cropboxes(S) 0 +#endif int k2settings_need_color_initially(K2PDFOPT_SETTINGS *k2settings); int k2settings_need_color_permanently(K2PDFOPT_SETTINGS *k2settings); int k2settings_ncolors(char *s); diff --git a/k2pdfoptlib/k2proc.c b/k2pdfoptlib/k2proc.c index c1bacf5..c68776c 100644 --- a/k2pdfoptlib/k2proc.c +++ b/k2pdfoptlib/k2proc.c @@ -85,6 +85,7 @@ void k2proc_init_one_document(void) bmpregion_vertically_break(NULL,NULL,NULL,0.,0,0,NULL); } +#if 0 /* ** Determine median font size (based on row heights) in a region. @@ -139,6 +140,7 @@ printf("Calling bmpregion_find_textrows for font size eval\n"); bmpregion_free(region); } +#endif /* ** First break the source page into cropboxes and/or gridded rectangles based @@ -154,6 +156,7 @@ void bmpregion_source_page_add(BMPREGION *region,K2PDFOPT_SETTINGS *k2settings, MASTERINFO *masterinfo,int level,int pages_done) { +#if 0 PAGEREGIONS *pageregions,_pageregions; int i,gridded; @@ -189,8 +192,12 @@ void bmpregion_source_page_add(BMPREGION *region,K2PDFOPT_SETTINGS *k2settings, bmpregion_source_box_process(&pageregions->pageregion[i].bmpregion, k2settings,masterinfo,level,pages_done); pageregions_free(pageregions); +#else + bmpregion_source_box_process(region, k2settings, masterinfo, level, pages_done); +#endif } +#if 0 void bmpregion_add_cover_image(BMPREGION *coverimage,K2PDFOPT_SETTINGS *k2settings, MASTERINFO *masterinfo) @@ -264,6 +271,7 @@ void bmpregion_add_cover_image(BMPREGION *coverimage,K2PDFOPT_SETTINGS *k2settin bmpregion_free(newregion); } +#endif /* ** Process a rectangular source page bitmap determined from either a cropbox or @@ -485,6 +493,7 @@ printf("Restoring DPI?\n"); pageregions_free(pageregions); } +#if 0 /* ** Set up gridded pageregion array @@ -786,6 +795,7 @@ static void bmpregion_set_cropbox_pixels(BMPREGION *dstregion,K2CROPBOX *cropbox dstregion->r2=srcregion->bmp8->height-1; } +#endif /* ** Return sorted list (by display order) of page regions up to appropriate level @@ -2499,6 +2509,7 @@ region_height_inches); #if (WILLUSDEBUGX & 1) printf("Added_region.force_scale = %g\n",added_region.force_scale); #endif +#if 0 if (added_region.force_scale < -1.5 && region_width_inches > MIN_REGION_WIDTH_INCHES && region_width_inches/k2settings->max_region_width_inches < 1.25 && region_height_inches > 0.5) @@ -2510,6 +2521,7 @@ printf("Added_region.force_scale = %g\n",added_region.force_scale); added_region.allow_text_wrapping = 0; } else +#endif revert=0; #if (WILLUSDEBUGX & 0x201) k2printf("Entering vert region loop, %d regions.\n",n); diff --git a/k2pdfoptlib/k2settings.c b/k2pdfoptlib/k2settings.c index c691280..41bc245 100644 --- a/k2pdfoptlib/k2settings.c +++ b/k2pdfoptlib/k2settings.c @@ -97,9 +97,11 @@ void k2pdfopt_settings_init(K2PDFOPT_SETTINGS *k2settings) k2settings->dst_fulljustify=-1; // 0 = no, 1 = yes k2settings->dst_sharpen=1; k2settings->dst_bpc=4; +#if 0 k2settings->dst_landscape=0; k2settings->dst_landscape_pages[0]='\0'; /* v2.32 */ strcpy(k2settings->dst_opname_format,"%s_k2opt"); +#endif k2settings->src_autostraighten=0; k2settings->dstmargins.pagelist[0]='\0'; k2settings->dstmargins.cboxflags=0; @@ -127,7 +129,9 @@ void k2pdfopt_settings_init(K2PDFOPT_SETTINGS *k2settings) k2settings->text_wrap=1; k2settings->word_spacing=-0.20; k2settings->display_width_inches = 3.6; /* Device width = dst_width / dst_dpi */ +#if 0 k2settings->pagelist[0]='\0'; +#endif k2settings->column_fitted=0; k2settings->contrast_max = 2.0; k2settings->dst_gamma=0.5; @@ -174,12 +178,14 @@ void k2pdfopt_settings_init(K2PDFOPT_SETTINGS *k2settings) k2settings->dst_width = k2settings->dst_userwidth; k2settings->dst_height = k2settings->dst_userheight; +#if 0 /* v2.10 */ k2settings->use_toc = -1; k2settings->toclist[0]='\0'; k2settings->tocsavefile[0]='\0'; k2settings->bpl[0]='\0'; k2cropboxes_init(&k2settings->cropboxes); +#endif /* v2.13 */ k2settings->devsize_set=0; @@ -191,11 +197,13 @@ void k2pdfopt_settings_init(K2PDFOPT_SETTINGS *k2settings) k2settings->restore_last_settings=-1; #endif +#if 0 /* v2.22 */ k2settings->dst_fgcolor[0]='\0'; k2settings->dst_bgcolor[0]='\0'; k2settings->dst_fgtype=0; k2settings->dst_bgtype=0; +#endif /* v2.31 */ #ifdef HAVE_GHOSTSCRIPT @@ -212,9 +220,11 @@ void k2pdfopt_settings_init(K2PDFOPT_SETTINGS *k2settings) k2settings->pagebreakmark_breakpage_color=-1; k2settings->pagebreakmark_nobreak_color=-1; k2settings->erase_horizontal_lines=0; +#if 0 k2settings->pagexlist[0]='\0'; k2settings->dst_author[0]='\0'; k2settings->dst_title[0]='\0'; +#endif /* v2.34 */ k2settings->dst_fontsize_pts=0.; /* 0 = not used */ @@ -315,6 +325,7 @@ K2NOTES *page_has_notes_margin(K2PDFOPT_SETTINGS *k2settings,MASTERINFO *masteri return(NULL); } +#if 0 /* ** Should the current source page be turned to landscape mode? @@ -339,8 +350,6 @@ printf(" retval=%d\n",retval); #endif return(retval); } - -#if 0 void k2pdfopt_conversion_init(K2PDFOPT_CONVERSION *k2conv) @@ -465,6 +474,7 @@ void k2pdfopt_settings_quick_sanity_check(K2PDFOPT_SETTINGS *k2settings) if (k2settings->text_wrap>0 || k2settings_output_is_bitmap(k2settings)) k2settings->use_crop_boxes=0; +#if 0 /* ** v2.22: If -colorfg or -colorbg not grayscale, turn color output on. */ @@ -488,6 +498,7 @@ void k2pdfopt_settings_quick_sanity_check(K2PDFOPT_SETTINGS *k2settings) if (k2settings_color_type(k2settings_color_by_index(k2settings->dst_bgcolor,i))==2) k2settings->dst_color=1; } +#endif /* v2.22: If previewing a native PDF, turn color output on. */ if (!k2settings->dst_color && k2settings->use_crop_boxes && k2settings->preview_page!=0) @@ -631,6 +642,7 @@ printf("restore: dst_dpi=%d\n",k2settings->dst_dpi); #endif } +#if 0 void k2pdfopt_settings_fit_column_to_screen(K2PDFOPT_SETTINGS *k2settings, double column_width_inches) @@ -658,6 +670,7 @@ printf("fit_column_to_screen: dst_dpi=%d\n",k2settings->dst_dpi); k2settings->column_fitted=1; } +#endif /* ** Set device width and height in pixels. @@ -1035,6 +1048,8 @@ void k2cropbox_set_default_values(K2CROPBOX *cbox,double value,int units) } */ +#if 0 + /* ** Clear cropboxes that have flags set to flagtype */ @@ -1092,6 +1107,7 @@ int k2settings_has_cropboxes(K2PDFOPT_SETTINGS *k2settings) K2CROPBOX_FLAGS_NOTUSED|K2CROPBOX_FLAGS_IGNOREBOXEDAREA,0)>0); } +#endif int k2settings_need_color_initially(K2PDFOPT_SETTINGS *k2settings) diff --git a/lib/setting.c b/lib/setting.c index 8c6fe80..2732acc 100644 --- a/lib/setting.c +++ b/lib/setting.c @@ -42,7 +42,9 @@ void k2pdfopt_settings_init_from_koptcontext(K2PDFOPT_SETTINGS *k2settings, cons k2settings->dst_userheight = 800; k2settings->dst_width = k2settings->dst_userwidth; k2settings->dst_height = k2settings->dst_userheight; +#ifdef HAVE_OCR_LIB k2settings->dst_ocr = 0; +#endif k2settings->dst_color = 0; k2settings->use_crop_boxes = 0; k2settings->defect_size_pts = 1.0; diff --git a/willuslib/filelist.c b/willuslib/filelist.c index 1283e4e..f8b15cb 100644 --- a/willuslib/filelist.c +++ b/willuslib/filelist.c @@ -2705,6 +2705,7 @@ void filelist_reslash(FILELIST *fl) wfile_reslash(fl->entry[i].name); } +#if 0 /* ** Fill from unix-style archive (.a) file @@ -2845,3 +2846,5 @@ entry->name); willus_mem_free((double **)&namebuf,funcname); return(0); } + +#endif diff --git a/willuslib/wsys.c b/willuslib/wsys.c index c89409b..f4d7762 100644 --- a/willuslib/wsys.c +++ b/willuslib/wsys.c @@ -57,6 +57,7 @@ static void gnu_compiler(char *compiler_version); #endif static int wsys_decimal_is_period(void); +#if 0 void wsys_system_version(char *system,char *_os,char *_chip,char *_compiler) @@ -338,6 +339,7 @@ void wsys_sleep_ms(int ms) #endif } +#endif int wsys_num_cpus(void) @@ -351,6 +353,7 @@ int wsys_num_cpus(void) #endif } +#if 0 char *wsys_full_exe_name(char *s) @@ -463,6 +466,9 @@ double wsys_year_double(struct tm *date) +date->tm_sec/(365.25*24.*3600.)); } +#endif + +#ifdef K2PDFOPT_DEBUG double wsys_utc_offset(void) @@ -502,6 +508,9 @@ char *wsys_utc_string(void) return(buf); } +#endif + +#if 0 /* ** Call with 1 to set decimal point to a period. @@ -757,3 +766,5 @@ int wsys_shell_command(char *cmd,char *stdoutfile,char *stderrfile) willus_mem_free((double **)&syscmd,funcname); return(status); } + +#endif From a5b660a89ab860bd1915ec7c5700d8e2b287387c Mon Sep 17 00:00:00 2001 From: Benoit Pierre Date: Sun, 4 Oct 2026 13:26:21 +0200 Subject: [PATCH 4/4] disable some unused code --- k2pdfoptlib/k2file.c | 3 +++ willuslib/filelist.c | 2 ++ willuslib/string.c | 2 ++ willuslib/wfile.c | 5 +++++ 4 files changed, 12 insertions(+) diff --git a/k2pdfoptlib/k2file.c b/k2pdfoptlib/k2file.c index 44d9d44..2a5b8b8 100644 --- a/k2pdfoptlib/k2file.c +++ b/k2pdfoptlib/k2file.c @@ -1675,6 +1675,7 @@ static int toclist_valid(char *s,FILE *out) return(0); } +#if 0 /* ** Create outline from page list @@ -1713,6 +1714,8 @@ static WPDFOUTLINE *wpdfoutline_from_pagelist(char *pagelist,int maxpages) return(outline0); } +#endif + int get_source_type(char *filename) diff --git a/willuslib/filelist.c b/willuslib/filelist.c index f8b15cb..d308b48 100644 --- a/willuslib/filelist.c +++ b/willuslib/filelist.c @@ -1522,6 +1522,7 @@ static void filelist_conditionally_add_file(FILELIST *fl,wfile *wf, } } +#if 0 void filelist_filter(FILELIST *fl,char *include[],char *exclude[]) @@ -1569,6 +1570,7 @@ void filelist_round_seconds(FILELIST *fl) fl->sorted=0; } +#endif int filelist_use_file(char *fullname,char *include_only[],char *exclude[]) diff --git a/willuslib/string.c b/willuslib/string.c index cfc0fb3..91fffcc 100644 --- a/willuslib/string.c +++ b/willuslib/string.c @@ -987,6 +987,7 @@ void exp_str(char *buf,int maxlen,int decimals,double value) buf[j+2]='\0'; } +#if 0 /* ** Parses most date/time formats. The key assumption is that the time @@ -1282,6 +1283,7 @@ int structtm_from_time(struct tm *date,char *time) return(0); } +#endif /* ** Like strtok, but allows empty "cells". E.g. if there are consecutive diff --git a/willuslib/wfile.c b/willuslib/wfile.c index 5312058..6f5cbf8 100644 --- a/willuslib/wfile.c +++ b/willuslib/wfile.c @@ -585,6 +585,7 @@ int wfile_date(const char *filename,struct tm *filedate) #endif } +#if 0 /* ** Add/subtract seconds from date @@ -749,6 +750,7 @@ void wfile_set_mod_date(char *filename,struct tm *date) #endif } +#endif /* ** see rpp.c in utility folder! @@ -789,6 +791,7 @@ int wfile_is_regular_file(char *filename) #endif } +#if 0 int wfile_saved_during_daylight_savings(char *filename) @@ -956,6 +959,8 @@ int wfile_leap_year(int year) return((year%400==0) || ((year%100!=0) && (year%4==0))); } +#endif + /* ** Set working directory. ** Returns 0 for success, otherwise error code.