diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-09-21 14:29:15 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-09-21 14:29:15 +0200 |
| commit | 7ea30aff0d525996a91d0ca4e0cf1a75f51e73d2 (patch) | |
| tree | d1e9d315914d22e5f4b49124e0111fc8bb2906ce /libps | |
| parent | 8933e05c0237ce4a5cec40291a8cd3fbdbf4acd9 (diff) | |
| parent | fc186a1d87ff6c58db228740cc9b04da164c7af1 (diff) | |
Merge remote-tracking branch 'mainline/master' into dde
Conflicts:
Makefile
ext2fs/hyper.c
libdiskfs/dir-lookup.c
libfshelp/Makefile
Diffstat (limited to 'libps')
| -rw-r--r-- | libps/write.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libps/write.c b/libps/write.c index 83be42ab5..1f7f52cc1 100644 --- a/libps/write.c +++ b/libps/write.c @@ -52,7 +52,7 @@ flush (const char **beg, const char *new, FILE *s) /* Write T to S, up to MAX characters (unless MAX == 0), making sure not to write any unprintable characters. */ error_t -noise_write (const unsigned char *t, ssize_t max, FILE *s) +noise_write (const char *t, ssize_t max, FILE *s) { int ch; const char *ok = t; |