* fileio.c:

* main.c:
    * ppiwin.c:
    * ser_posix.c:
    * stk500.c:
    Minor code cleanup to remove warnings.


git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@346 81a1dc3b-b13d-400b-aceb-764788c761c2
This commit is contained in:
arcanum 2003-08-25 15:55:48 +00:00
parent e09ce4ec22
commit c9a242e254
6 changed files with 21 additions and 6 deletions

View File

@ -1,3 +1,12 @@
2003-08-25 Eric B. Weddington <eric@ecentral.com>
* fileio.c:
* main.c:
* ppiwin.c:
* ser_posix.c:
* stk500.c:
Minor code cleanup to remove warnings.
2003-08-01 Theodore A. Roth <troth@openavr.org> 2003-08-01 Theodore A. Roth <troth@openavr.org>
* avrdude.1: Document the -q option. * avrdude.1: Document the -q option.

View File

@ -895,7 +895,6 @@ int fileio(int op, char * filename, FILEFMT format,
char * fname; char * fname;
unsigned char * buf; unsigned char * buf;
struct fioparms fio; struct fioparms fio;
int i;
AVRMEM * mem; AVRMEM * mem;
int using_stdio; int using_stdio;

4
main.c
View File

@ -334,7 +334,7 @@ static void update_progress_tty (int percent, double etime, char *hdr)
{ {
static char hashes[51]; static char hashes[51];
static char *header; static char *header;
static last = 0; static int last = 0;
int i; int i;
hashes[50] = 0; hashes[50] = 0;
@ -745,7 +745,6 @@ int main(int argc, char * argv [])
int cycles; /* erase-rewrite cycles */ int cycles; /* erase-rewrite cycles */
int set_cycles; /* value to set the erase-rewrite cycles to */ int set_cycles; /* value to set the erase-rewrite cycles to */
char * e; /* for strtol() error checking */ char * e; /* for strtol() error checking */
char * homedir;
int quell_progress; int quell_progress;
progname = rindex(argv[0],'/'); progname = rindex(argv[0],'/');
@ -797,6 +796,7 @@ int main(int argc, char * argv [])
win_usr_config_set(usr_config); win_usr_config_set(usr_config);
#else #else
char * homedir;
strcpy(sys_config, CONFIG_DIR); strcpy(sys_config, CONFIG_DIR);
i = strlen(sys_config); i = strlen(sys_config);

View File

@ -351,8 +351,10 @@ BOOL usecPerfDelay(long t)
} }
} }
// WARNING WARNING This function replaces the standard usleep() library function /*
// because it doesn't appear to delay for the correct time WARNING WARNING This function replaces the standard usleep() library function
because it doesn't appear to delay for the correct time.
*/
#ifndef MIN_SLEEP_USEC #ifndef MIN_SLEEP_USEC
#define MIN_SLEEP_USEC 20000 #define MIN_SLEEP_USEC 20000
@ -364,7 +366,7 @@ unsigned usleep( unsigned int uSeconds )
struct timespec nanoDelay ; struct timespec nanoDelay ;
if (usecPerfDelay(uSeconds)) if (usecPerfDelay(uSeconds))
return; return(0);
gettimeofday(&t1, NULL); gettimeofday(&t1, NULL);
@ -384,6 +386,8 @@ unsigned usleep( unsigned int uSeconds )
do { do {
gettimeofday(&t2, NULL); gettimeofday(&t2, NULL);
} while (timercmp(&t2, &t1, <)); } while (timercmp(&t2, &t1, <));
return(0);
} }

View File

@ -23,7 +23,9 @@
* Posix serial interface for avrdude. * Posix serial interface for avrdude.
*/ */
#include <ctype.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h>
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include <sys/types.h> #include <sys/types.h>

View File

@ -34,6 +34,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include <unistd.h>
#include "avr.h" #include "avr.h"
#include "pgm.h" #include "pgm.h"