X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Flib.h;h=f8659ed192a3b276fd604b1ba884d367d11476b7;hb=ab3b3f178718c0ae7b5738e987e350537574d2e6;hp=e7916a11220eae6d6da8dcb1e3e371cceaaeb8e4;hpb=7324ffdbc66b3ddadc317361cb14f464da3efc24;p=libucw.git diff --git a/lib/lib.h b/lib/lib.h index e7916a11..f8659ed1 100644 --- a/lib/lib.h +++ b/lib/lib.h @@ -164,8 +164,8 @@ int match_ct_patt(const char *, const char *); /* wordsplit.c */ -int sepsplit(byte *str, byte sep, byte **rec, uns max); -int wordsplit(byte *str, byte **rec, uns max); +int sepsplit(char *str, uns sep, char **rec, uns max); +int wordsplit(char *str, char **rec, uns max); /* pat(i)match.c: Matching of shell patterns */ @@ -174,8 +174,8 @@ int match_pattern_nocase(const char *patt, const char *str); /* md5hex.c */ -void md5_to_hex(const byte *s, byte *d); -void hex_to_md5(const byte *s, byte *d); +void md5_to_hex(const byte *s, char *d); +void hex_to_md5(const char *s, byte *d); #define MD5_SIZE 16 #define MD5_HEX_SIZE 33 @@ -192,20 +192,20 @@ uns prev_table_prime(uns x); /* timer.c */ -struct timeval; +timestamp_t get_timestamp(void); -void init_timer(void); -uns get_timer(void); -void get_last_timeval(struct timeval *tv); +void init_timer(timestamp_t *timer); +uns get_timer(timestamp_t *timer); +uns switch_timer(timestamp_t *old, timestamp_t *new); /* regex.c */ typedef struct regex regex; -regex *rx_compile(const byte *r, int icase); +regex *rx_compile(const char *r, int icase); void rx_free(regex *r); -int rx_match(regex *r, const byte *s); -int rx_subst(regex *r, const byte *by, const byte *src, byte *dest, uns destlen); +int rx_match(regex *r, const char *s); +int rx_subst(regex *r, const char *by, const char *src, char *dest, uns destlen); /* random.c */ @@ -216,7 +216,7 @@ u64 random_max_u64(u64 max); /* mmap.c */ -void *mmap_file(const byte *name, unsigned *len, int writeable); +void *mmap_file(const char *name, unsigned *len, int writeable); void munmap_file(void *start, unsigned len); /* proctitle.c */ @@ -232,16 +232,16 @@ void randomkey(byte *buf, uns size); /* exitstatus.c */ #define EXIT_STATUS_MSG_SIZE 32 -int format_exit_status(byte *msg, int stat); +int format_exit_status(char *msg, int stat); /* runcmd.c */ -int run_command(const byte *cmd, ...); -void NONRET exec_command(const byte *cmd, ...); -void echo_command(byte *buf, int size, const byte *cmd, ...); -int run_command_v(const byte *cmd, va_list args); -void NONRET exec_command_v(const byte *cmd, va_list args); -void echo_command_v(byte *buf, int size, const byte *cmd, va_list args); +int run_command(const char *cmd, ...); +void NONRET exec_command(const char *cmd, ...); +void echo_command(char *buf, int size, const char *cmd, ...); +int run_command_v(const char *cmd, va_list args); +void NONRET exec_command_v(const char *cmd, va_list args); +void echo_command_v(char *buf, int size, const char *cmd, va_list args); /* carefulio.c */ @@ -250,7 +250,7 @@ int careful_write(int fd, const void *buf, int len); /* sync.c */ -void sync_dir(const byte *name); +void sync_dir(const char *name); /* sighandler.c */ @@ -262,16 +262,18 @@ sh_sighandler_t set_signal_handler(int signum, sh_sighandler_t new); /* string.c */ -byte *str_unesc(byte *dest, const byte *src); -byte *str_format_flags(byte *dest, const byte *fmt, uns flags); +char *str_unesc(char *dest, const char *src); +char *str_format_flags(char *dest, const char *fmt, uns flags); /* bigalloc.c */ -void *page_alloc(unsigned int len) LIKE_MALLOC; // allocates a multiple of CPU_PAGE_SIZE bytes with mmap -void page_free(void *start, unsigned int len); -void *page_realloc(void *start, unsigned int old_len, unsigned int new_len); +void *page_alloc(u64 len) LIKE_MALLOC; // allocates a multiple of CPU_PAGE_SIZE bytes with mmap +void *page_alloc_zero(u64 len) LIKE_MALLOC; +void page_free(void *start, u64 len); +void *page_realloc(void *start, u64 old_len, u64 new_len); -void *big_alloc(unsigned int len) LIKE_MALLOC; // allocate a large memory block in the most efficient way available -void big_free(void *start, unsigned int len); +void *big_alloc(u64 len) LIKE_MALLOC; // allocate a large memory block in the most efficient way available +void *big_alloc_zero(u64 len) LIKE_MALLOC; +void big_free(void *start, u64 len); #endif