Adaption to Xorriso_standalonE, some consequences from compiler warnings
This commit is contained in:
@@ -587,24 +587,24 @@ int Sfile_scale(double value, char *result, int siz, double thresh, int flag)
|
||||
}
|
||||
if(scale_c!='b' && !(flag&4)) { /* is there room for fractional part ? */
|
||||
avail_siz= siz-1;
|
||||
sprintf(form,"%%.lf");
|
||||
sprintf(result,"%.lf",value);
|
||||
sprintf(form,"%%.f");
|
||||
sprintf(result,"%.f",value);
|
||||
if(strlen(result)<=avail_siz-2)
|
||||
dec_siz= 1; /* we are very modest */
|
||||
}
|
||||
if(scale_c=='b' && (flag&1)) {
|
||||
if(flag&2)
|
||||
sprintf(form,"%%.lf");
|
||||
sprintf(form,"%%.f");
|
||||
else
|
||||
sprintf(form,"%%%d.lf",siz);
|
||||
sprintf(form,"%%%d.f",siz);
|
||||
sprintf(result,form,value);
|
||||
} else {
|
||||
if(flag&2)
|
||||
sprintf(form,"%%.lf%%c");
|
||||
sprintf(form,"%%.f%%c");
|
||||
else if(dec_siz>0)
|
||||
sprintf(form,"%%%d.%dlf%%c",avail_siz,dec_siz);
|
||||
sprintf(form,"%%%d.%df%%c",avail_siz,dec_siz);
|
||||
else
|
||||
sprintf(form,"%%%d.lf%%c",siz-1);
|
||||
sprintf(form,"%%%d.f%%c",siz-1);
|
||||
sprintf(result,form,value,scale_c);
|
||||
}
|
||||
return(1);
|
||||
@@ -6240,7 +6240,7 @@ int Xorriso_option_cdi(struct XorrisO *xorriso, char *iso_rr_path, int flag)
|
||||
/* Option -cdx */
|
||||
int Xorriso_option_cdx(struct XorrisO *xorriso, char *disk_path, int flag)
|
||||
{
|
||||
char sfe[5*SfileadrL], path[SfileadrL], eff_path[SfileadrL];;
|
||||
char sfe[5*SfileadrL], path[SfileadrL], eff_path[SfileadrL];
|
||||
int ret;
|
||||
|
||||
if (strlen(disk_path)>sizeof(xorriso->wdx)) {
|
||||
@@ -8714,7 +8714,7 @@ int Xorriso_execute_option(struct XorrisO *xorriso, char *line, int flag)
|
||||
tdiff= 0.001;
|
||||
if(xorriso->error_count>0) {
|
||||
sprintf(xorriso->info_text,
|
||||
"----------------------------- %7.lf errors encountered\n",
|
||||
"----------------------------- %7.f errors encountered\n",
|
||||
xorriso->error_count);
|
||||
Xorriso_info(xorriso,!(flag&(1<<16)));
|
||||
}
|
||||
|
Reference in New Issue
Block a user