diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-10-06 20:55:28 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-10-06 20:55:28 +0000 |
commit | 61c39c60565b386e0e12ea669556b030e8cd7180 (patch) | |
tree | 59109aeab8297bdc996faca8c4e38ec7426c36cf /src/util/os_priority.c | |
parent | 780eb09dd8040ecf8649d40ddf8314464e0fc48e (diff) | |
download | gnunet-61c39c60565b386e0e12ea669556b030e8cd7180.tar.gz gnunet-61c39c60565b386e0e12ea669556b030e8cd7180.zip |
-remove trailing whitespace
Diffstat (limited to 'src/util/os_priority.c')
-rw-r--r-- | src/util/os_priority.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/util/os_priority.c b/src/util/os_priority.c index 7a6d93858..d499ed985 100644 --- a/src/util/os_priority.c +++ b/src/util/os_priority.c | |||
@@ -80,7 +80,7 @@ parent_control_handler (void *cls, | |||
80 | char sig; | 80 | char sig; |
81 | char *pipe_fd; | 81 | char *pipe_fd; |
82 | ssize_t ret; | 82 | ssize_t ret; |
83 | 83 | ||
84 | LOG (GNUNET_ERROR_TYPE_DEBUG, "`%s' invoked because of %d\n", __FUNCTION__, | 84 | LOG (GNUNET_ERROR_TYPE_DEBUG, "`%s' invoked because of %d\n", __FUNCTION__, |
85 | tc->reason); | 85 | tc->reason); |
86 | if (0 != (tc->reason & | 86 | if (0 != (tc->reason & |
@@ -275,7 +275,7 @@ GNUNET_OS_process_kill (struct GNUNET_OS_Process *proc, int sig) | |||
275 | #else | 275 | #else |
276 | LOG (GNUNET_ERROR_TYPE_DEBUG, "Sending signal %d to pid: %u via system call\n", sig, proc->pid); | 276 | LOG (GNUNET_ERROR_TYPE_DEBUG, "Sending signal %d to pid: %u via system call\n", sig, proc->pid); |
277 | return PLIBC_KILL (proc->pid, sig); | 277 | return PLIBC_KILL (proc->pid, sig); |
278 | #endif | 278 | #endif |
279 | } | 279 | } |
280 | } | 280 | } |
281 | 281 | ||
@@ -753,7 +753,7 @@ start_process (int pipe_control, | |||
753 | 753 | ||
754 | if (GNUNET_SYSERR == GNUNET_OS_check_helper_binary (filename, GNUNET_NO, NULL)) | 754 | if (GNUNET_SYSERR == GNUNET_OS_check_helper_binary (filename, GNUNET_NO, NULL)) |
755 | return NULL; /* not executable */ | 755 | return NULL; /* not executable */ |
756 | 756 | ||
757 | /* Search in prefix dir (hopefully - the directory from which | 757 | /* Search in prefix dir (hopefully - the directory from which |
758 | * the current module was loaded), bindir and libdir, then in PATH | 758 | * the current module was loaded), bindir and libdir, then in PATH |
759 | */ | 759 | */ |
@@ -902,7 +902,7 @@ start_process (int pipe_control, | |||
902 | else | 902 | else |
903 | SetHandleInformation (stdih, HANDLE_FLAG_INHERIT, 0); | 903 | SetHandleInformation (stdih, HANDLE_FLAG_INHERIT, 0); |
904 | } | 904 | } |
905 | 905 | ||
906 | 906 | ||
907 | stdoh = GetStdHandle (STD_OUTPUT_HANDLE); | 907 | stdoh = GetStdHandle (STD_OUTPUT_HANDLE); |
908 | GetHandleInformation (stdoh, &stdof); | 908 | GetHandleInformation (stdoh, &stdof); |
@@ -1054,7 +1054,7 @@ start_process (int pipe_control, | |||
1054 | 1054 | ||
1055 | if ((NULL == pipe_stdin) && (stdih)) | 1055 | if ((NULL == pipe_stdin) && (stdih)) |
1056 | SetHandleInformation (stdih, HANDLE_FLAG_INHERIT, stdif); | 1056 | SetHandleInformation (stdih, HANDLE_FLAG_INHERIT, stdif); |
1057 | 1057 | ||
1058 | 1058 | ||
1059 | if ((NULL == pipe_stdout) && (stdoh)) | 1059 | if ((NULL == pipe_stdout) && (stdoh)) |
1060 | SetHandleInformation (stdoh, HANDLE_FLAG_INHERIT, stdof); | 1060 | SetHandleInformation (stdoh, HANDLE_FLAG_INHERIT, stdof); |
@@ -1116,7 +1116,7 @@ start_process (int pipe_control, | |||
1116 | wrote = GNUNET_DISK_file_write (lsocks_write_fd, &count, sizeof (count)); | 1116 | wrote = GNUNET_DISK_file_write (lsocks_write_fd, &count, sizeof (count)); |
1117 | if (sizeof (count) != wrote) | 1117 | if (sizeof (count) != wrote) |
1118 | { | 1118 | { |
1119 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 1119 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
1120 | "Failed to write %u count bytes to the child: %u\n", | 1120 | "Failed to write %u count bytes to the child: %u\n", |
1121 | sizeof (count), GetLastError ()); | 1121 | sizeof (count), GetLastError ()); |
1122 | break; | 1122 | break; |
@@ -1127,8 +1127,8 @@ start_process (int pipe_control, | |||
1127 | /* Get a socket duplication info */ | 1127 | /* Get a socket duplication info */ |
1128 | if (SOCKET_ERROR == WSADuplicateSocketA (lsocks[i], gnunet_proc->pid, &pi)) | 1128 | if (SOCKET_ERROR == WSADuplicateSocketA (lsocks[i], gnunet_proc->pid, &pi)) |
1129 | { | 1129 | { |
1130 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 1130 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
1131 | "Failed to duplicate an socket[%llu]: %u\n", i, | 1131 | "Failed to duplicate an socket[%llu]: %u\n", i, |
1132 | GetLastError ()); | 1132 | GetLastError ()); |
1133 | break; | 1133 | break; |
1134 | } | 1134 | } |
@@ -1144,8 +1144,8 @@ start_process (int pipe_control, | |||
1144 | wrote = GNUNET_DISK_file_write (lsocks_write_fd, &size, sizeof (size)); | 1144 | wrote = GNUNET_DISK_file_write (lsocks_write_fd, &size, sizeof (size)); |
1145 | if (sizeof (size) != wrote) | 1145 | if (sizeof (size) != wrote) |
1146 | { | 1146 | { |
1147 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 1147 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
1148 | "Failed to write %u size[%llu] bytes to the child: %u\n", | 1148 | "Failed to write %u size[%llu] bytes to the child: %u\n", |
1149 | sizeof (size), i, GetLastError ()); | 1149 | sizeof (size), i, GetLastError ()); |
1150 | break; | 1150 | break; |
1151 | } | 1151 | } |
@@ -1153,8 +1153,8 @@ start_process (int pipe_control, | |||
1153 | wrote = GNUNET_DISK_file_write (lsocks_write_fd, &pi, sizeof (pi)); | 1153 | wrote = GNUNET_DISK_file_write (lsocks_write_fd, &pi, sizeof (pi)); |
1154 | if (sizeof (pi) != wrote) | 1154 | if (sizeof (pi) != wrote) |
1155 | { | 1155 | { |
1156 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 1156 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
1157 | "Failed to write %u socket[%llu] bytes to the child: %u\n", | 1157 | "Failed to write %u socket[%llu] bytes to the child: %u\n", |
1158 | sizeof (pi), i, GetLastError ()); | 1158 | sizeof (pi), i, GetLastError ()); |
1159 | break; | 1159 | break; |
1160 | } | 1160 | } |
@@ -1207,7 +1207,7 @@ GNUNET_OS_start_process_vap (int pipe_control, | |||
1207 | enum GNUNET_OS_InheritStdioFlags std_inheritance, | 1207 | enum GNUNET_OS_InheritStdioFlags std_inheritance, |
1208 | struct GNUNET_DISK_PipeHandle *pipe_stdin, | 1208 | struct GNUNET_DISK_PipeHandle *pipe_stdin, |
1209 | struct GNUNET_DISK_PipeHandle *pipe_stdout, | 1209 | struct GNUNET_DISK_PipeHandle *pipe_stdout, |
1210 | const char *filename, | 1210 | const char *filename, |
1211 | char *const argv[]) | 1211 | char *const argv[]) |
1212 | { | 1212 | { |
1213 | return start_process (pipe_control, | 1213 | return start_process (pipe_control, |
@@ -1328,7 +1328,7 @@ GNUNET_OS_start_process_v (int pipe_control, | |||
1328 | /** | 1328 | /** |
1329 | * Retrieve the status of a process, waiting on him if dead. | 1329 | * Retrieve the status of a process, waiting on him if dead. |
1330 | * Nonblocking version. | 1330 | * Nonblocking version. |
1331 | * | 1331 | * |
1332 | * @param proc process ID | 1332 | * @param proc process ID |
1333 | * @param type status type | 1333 | * @param type status type |
1334 | * @param code return code/signal number | 1334 | * @param code return code/signal number |
@@ -1441,7 +1441,7 @@ GNUNET_OS_process_wait (struct GNUNET_OS_Process *proc) | |||
1441 | 1441 | ||
1442 | while ( (pid != (ret = waitpid (pid, NULL, 0))) && | 1442 | while ( (pid != (ret = waitpid (pid, NULL, 0))) && |
1443 | (EINTR == errno) ) ; | 1443 | (EINTR == errno) ) ; |
1444 | if (pid != ret) | 1444 | if (pid != ret) |
1445 | { | 1445 | { |
1446 | LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "waitpid"); | 1446 | LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "waitpid"); |
1447 | return GNUNET_SYSERR; | 1447 | return GNUNET_SYSERR; |