projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6
[powerpc.git]
/
arch
/
um
/
drivers
/
mconsole_user.c
diff --git
a/arch/um/drivers/mconsole_user.c
b/arch/um/drivers/mconsole_user.c
index
310c1f8
..
4b109fe
100644
(file)
--- a/
arch/um/drivers/mconsole_user.c
+++ b/
arch/um/drivers/mconsole_user.c
@@
-122,12
+122,12
@@
int mconsole_get_request(int fd, struct mc_request *req)
return(1);
}
return(1);
}
-int mconsole_reply(struct mc_request *req, char *str, int err, int more)
+int mconsole_reply_len(struct mc_request *req, const char *str, int total,
+ int err, int more)
{
struct mconsole_reply reply;
{
struct mconsole_reply reply;
- int
total,
len, n;
+ int len, n;
- total = strlen(str);
do {
reply.err = err;
do {
reply.err = err;
@@
-155,6
+155,12
@@
int mconsole_reply(struct mc_request *req, char *str, int err, int more)
return(0);
}
return(0);
}
+int mconsole_reply(struct mc_request *req, const char *str, int err, int more)
+{
+ return mconsole_reply_len(req, str, strlen(str), err, more);
+}
+
+
int mconsole_unlink_socket(void)
{
unlink(mconsole_socket_name);
int mconsole_unlink_socket(void)
{
unlink(mconsole_socket_name);