diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-02-16 13:18:17 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-02-16 13:18:17 +0000 |
commit | 284d0faed6a1ec2adcc4b7aea31ae3d05b3b70d9 (patch) | |
tree | 3cfcea06c5a5c9e454edd39b58111ef38810882c /include | |
parent | 069e347863fa46f684ab6bd7e48cefd8fa74b629 (diff) | |
download | busybox-w32-284d0faed6a1ec2adcc4b7aea31ae3d05b3b70d9.tar.gz busybox-w32-284d0faed6a1ec2adcc4b7aea31ae3d05b3b70d9.tar.bz2 busybox-w32-284d0faed6a1ec2adcc4b7aea31ae3d05b3b70d9.zip |
random s/short/int/
add_cmd 1189 1190 +1
xconnect_ftpdata 118 117 -1
data_align 86 84 -2
process_files 2101 2096 -5
forkexec 1345 1334 -11
Diffstat (limited to 'include')
-rw-r--r-- | include/libbb.h | 4 | ||||
-rw-r--r-- | include/unarchive.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/libbb.h b/include/libbb.h index b405df541..3175c8e7f 100644 --- a/include/libbb.h +++ b/include/libbb.h | |||
@@ -595,14 +595,14 @@ int bb_execvp(const char *file, char *const argv[]); | |||
595 | pid_t spawn(char **argv); | 595 | pid_t spawn(char **argv); |
596 | pid_t xspawn(char **argv); | 596 | pid_t xspawn(char **argv); |
597 | 597 | ||
598 | /* Unlike waitpid, waits ONLY for one process, | 598 | int safe_waitpid(int pid, int *wstat, int options); |
599 | /* Unlike waitpid, waits ONLY for one process. | ||
599 | * It's safe to pass negative 'pids' from failed [v]fork - | 600 | * It's safe to pass negative 'pids' from failed [v]fork - |
600 | * wait4pid will return -1 (and will not clobber [v]fork's errno). | 601 | * wait4pid will return -1 (and will not clobber [v]fork's errno). |
601 | * IOW: rc = wait4pid(spawn(argv)); | 602 | * IOW: rc = wait4pid(spawn(argv)); |
602 | * if (rc < 0) bb_perror_msg("%s", argv[0]); | 603 | * if (rc < 0) bb_perror_msg("%s", argv[0]); |
603 | * if (rc > 0) bb_error_msg("exit code: %d", rc); | 604 | * if (rc > 0) bb_error_msg("exit code: %d", rc); |
604 | */ | 605 | */ |
605 | int safe_waitpid(int pid, int *wstat, int options); | ||
606 | int wait4pid(int pid); | 606 | int wait4pid(int pid); |
607 | int wait_any_nohang(int *wstat); | 607 | int wait_any_nohang(int *wstat); |
608 | #define wait_crashed(w) ((w) & 127) | 608 | #define wait_crashed(w) ((w) & 127) |
diff --git a/include/unarchive.h b/include/unarchive.h index 4ed2ccd0c..8b76217b4 100644 --- a/include/unarchive.h +++ b/include/unarchive.h | |||
@@ -97,7 +97,7 @@ extern void seek_by_read(const archive_handle_t *archive_handle, const unsigned | |||
97 | 97 | ||
98 | extern ssize_t archive_xread_all_eof(archive_handle_t *archive_handle, unsigned char *buf, size_t count); | 98 | extern ssize_t archive_xread_all_eof(archive_handle_t *archive_handle, unsigned char *buf, size_t count); |
99 | 99 | ||
100 | extern void data_align(archive_handle_t *archive_handle, const unsigned short boundary); | 100 | extern void data_align(archive_handle_t *archive_handle, unsigned boundary); |
101 | extern const llist_t *find_list_entry(const llist_t *list, const char *filename); | 101 | extern const llist_t *find_list_entry(const llist_t *list, const char *filename); |
102 | extern const llist_t *find_list_entry2(const llist_t *list, const char *filename); | 102 | extern const llist_t *find_list_entry2(const llist_t *list, const char *filename); |
103 | 103 | ||