From ce79d3e12cc733eaf9ce739812b49d1e01f562ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se>
Date: Sat, 14 Apr 2012 14:21:29 +0200
Subject: [PATCH] examples/io.c: Made write_file use write_string.
---
ChangeLog | 2 ++
examples/io.c | 26 +++++++++++---------------
2 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f4c33559..28155464 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2012-04-14 Niels Möller <nisse@lysator.liu.se>
+ * examples/io.c (write_file): Use write_string.
+
* examples/Makefile.in (base64enc): New target. Also added missing
io.o dependency to several other targets.
diff --git a/examples/io.c b/examples/io.c
index a18dac1f..d58c2473 100644
--- a/examples/io.c
+++ b/examples/io.c
@@ -132,28 +132,24 @@ read_file(const char *name, unsigned max_size, char **contents)
}
int
-write_file(const char *name, unsigned size, const char *buffer)
+write_string(FILE *f, unsigned size, const char *buffer)
{
- FILE *f = fopen(name, "wb");
- unsigned res;
-
- if (!f)
- return 0;
-
- res = fwrite(buffer, 1, size, f);
-
- if (res < size)
- res = 0;
+ size_t res = fwrite(buffer, 1, size, f);
- return fclose(f) == 0 && res > 0;
+ return res == size;
}
int
-write_string(FILE *f, unsigned size, const char *buffer)
+write_file(const char *name, unsigned size, const char *buffer)
{
- size_t res = fwrite(buffer, 1, size, f);
+ FILE *f = fopen(name, "wb");
+ int res;
+
+ if (!f)
+ return 0;
- return res == size;
+ res = write_string(f, size, buffer);
+ return fclose(f) == 0 && res;
}
int
--
GitLab