Replaced unused timezone parameter of gettimeofday() by NULL

master
Thomas Schmitt 7 years ago
parent 07259e6051
commit f7b10f6eb8
  1. 7
      xorriso/parse_exec.c
  2. 4
      xorriso/sfile.c
  3. 5
      xorriso/text_io.c
  4. 2
      xorriso/xorriso_timestamp.h

@ -1,7 +1,7 @@
/* xorriso - creates, loads, manipulates and burns ISO 9660 filesystem images.
Copyright 2007-2015 Thomas Schmitt, <scdbackup@gmx.net>
Copyright 2007-2016 Thomas Schmitt, <scdbackup@gmx.net>
Provided under GPL version 2 or later.
@ -2072,9 +2072,8 @@ int Xorriso_execute_option(struct XorrisO *xorriso, char *line, int flag)
char **argv= NULL;
double tdiff;
struct timeval tv;
struct timezone tz;
gettimeofday(&tv,&tz);
gettimeofday(&tv, NULL);
Xorriso_reset_counters(xorriso,0);
xorriso->idle_time= 0.0;
tdiff= tv.tv_sec+(1.e-6*(double) tv.tv_usec);
@ -2091,7 +2090,7 @@ int Xorriso_execute_option(struct XorrisO *xorriso, char *line, int flag)
ret= Xorriso_interpreter(xorriso, argc, argv, &idx, flag&0xffff);
if(ret<0)
goto ex;
gettimeofday(&tv,&tz);
gettimeofday(&tv, NULL);
tdiff= tv.tv_sec+(1.e-6*(double) tv.tv_usec)-tdiff-xorriso->idle_time;
if(tdiff<0.001)
tdiff= 0.001;

@ -857,8 +857,8 @@ int Sfile_home_adr_s(char *filename, char *fileadr, int fa_size, int flag)
double Sfile_microtime(int flag)
{
struct timeval tv;
struct timezone tz;
gettimeofday(&tv,&tz);
gettimeofday(&tv, NULL);
return((double) (tv.tv_sec+1.0e-6*tv.tv_usec));
}

@ -333,10 +333,9 @@ int Xorriso_dialog_input(struct XorrisO *xorriso, char line[], int linesize,
#endif /* Xorriso_with_line_editoR */
double tdiff;
struct timeval tv;
struct timezone tz;
struct Xorriso_lsT *next_lst;
gettimeofday(&tv,&tz);
gettimeofday(&tv, NULL);
tdiff= tv.tv_sec+(1.e-6*(double) tv.tv_usec);
fflush(stdout);
@ -485,7 +484,7 @@ ex:;
free(cpt);
#endif
gettimeofday(&tv,&tz);
gettimeofday(&tv, NULL);
xorriso->idle_time+= tv.tv_sec+(1.e-6*(double) tv.tv_usec)-tdiff;
return(ret);
}

@ -1 +1 @@
#define Xorriso_timestamP "2016.03.09.205708"
#define Xorriso_timestamP "2016.03.10.200551"

Loading…
Cancel
Save