@@ -6,7 +6,7 @@
#ifndef _RANDOM_RANGE_H_
#define _RANDOM_RANGE_H_
-int parse_ranges ( char *, int, int, int, int (*)(), char **, char ** );
+int parse_ranges ( char *, int, int, int, int (*)(char *, int *), char **, char ** );
int range_min ( char *, int );
int range_max ( char *, int );
int range_mult ( char *, int );
@@ -125,7 +125,7 @@ extern int wlog_close(struct wlog_file *wfile);
extern int wlog_record_write(struct wlog_file *wfile,
struct wlog_rec *wrec, long offset);
extern int wlog_scan_backward(struct wlog_file *wfile, int nrecs,
- int (*func)(struct wlog_rec *rec),
+ int (*func)(struct wlog_rec *rec, long data),
long data);
#else
int wlog_open();
@@ -69,7 +69,7 @@ struct range {
* parse_range() returns -1 on error, or the number of ranges parsed.
*/
-static int str_to_int();
+static int str_to_int(char *str, int *ip);
static long long divider(long long, long long, long long, long long);
int
@@ -78,7 +78,7 @@ parse_ranges(
int defmin,
int defmax,
int defmult,
- int (*parse_func)(),
+ int (*parse_func)(char *str, int *ip),
char **rangeptr,
char **errptr)
{
@@ -570,8 +570,6 @@ printf(" diff = %lld, half = %lld, med = %lld\n", diff, half, med);
void
random_range_seed(long s)
{
- extern void srand48();
-
srand48(s);
}
@@ -54,7 +54,6 @@ int
string_to_tokens(char *arg_string, char *arg_array[], int array_size, char *separator)
{
int num_toks = 0; /* number of tokens found */
- char *strtok();
if ( arg_array == NULL || array_size <= 1 || separator == NULL )
return -1;
@@ -75,7 +75,7 @@
#ifndef __linux__
-static void lio_async_signal_handler();
+static void lio_async_signal_handler(int sig);
#endif
/*
@@ -217,7 +217,7 @@ int
wlog_scan_backward(
struct wlog_file *wfile,
int nrecs,
- int (*func)(),
+ int (*func)(struct wlog_rec *, long data),
long data)
{
int fd, leftover, nbytes, offset, recnum, reclen;