git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit '4b60911067a82fbdfa87b7c2824412da20287ed8'
[sliver-openvswitch.git]
/
lib
/
process.h
diff --git
a/lib/process.h
b/lib/process.h
index
94549f7
..
d40c1ac
100644
(file)
--- a/
lib/process.h
+++ b/
lib/process.h
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2008, 2009
Nicira Networks
.
+ * Copyright (c) 2008, 2009
, 2011, 2013 Nicira, Inc
.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-32,7
+32,7
@@
int process_kill(const struct process *, int signr);
int process_run(char **argv,
const int *keep_fds, size_t n_keep_fds,
int process_run(char **argv,
const int *keep_fds, size_t n_keep_fds,
-
const int *null_fds, size_t n_null_fds,
+ const int *null_fds, size_t n_null_fds,
int *status);
pid_t process_pid(const struct process *);
int *status);
pid_t process_pid(const struct process *);
@@
-45,8
+45,7
@@
void process_wait(struct process *);
char *process_search_path(const char *);
char *process_search_path(const char *);
-#define PROCESS_MAX_CAPTURE 65536
int process_run_capture(char **argv, char **stdout_log, char **stderr_log,
int process_run_capture(char **argv, char **stdout_log, char **stderr_log,
- int *status);
+
size_t max_log,
int *status);
#endif /* process.h */
#endif /* process.h */