commit ea8ba499615b7e8911fb6eb57894467723e6723e
author Thomas Klausner <tk@giga.or.at> Tue Sep 23 16:54:47 2014 +0200
committer Thomas Klausner <tk@giga.or.at> Tue Sep 23 16:54:47 2014 +0200
tree da2d4ab8adae2eef26fde83520ac325d69e0acc1
parent 0ff957c1c7ab515f557430edde2b21ded1c9e044

Implement I/O abstraction layer. Finally.

lib/zip_string.c

diff --git a/lib/zip_string.c b/lib/zip_string.c
index 6c3f1c0..a731ebb 100644
--- a/lib/zip_string.c
+++ b/lib/zip_string.c
@@ -1,6 +1,6 @@
 /*
   zip_string.c -- string handling (with encoding)
-  Copyright (C) 2012 Dieter Baron and Thomas Klausner
+  Copyright (C) 2012-2014 Dieter Baron and Thomas Klausner
 
   This file is part of libzip, a library to manipulate ZIP archives.
   The authors can be contacted at <libzip@nih.at>
@@ -145,12 +145,12 @@
 	expected_encoding = ZIP_ENCODING_CP437;
 	break;
     default:
-	_zip_error_set(error, ZIP_ER_INVAL, 0);
+	zip_error_set(error, ZIP_ER_INVAL, 0);
 	return NULL;
     }
 	
     if ((s=(struct zip_string *)malloc(sizeof(*s))) == NULL) {
-	_zip_error_set(error, ZIP_ER_MEMORY, 0);
+	zip_error_set(error, ZIP_ER_MEMORY, 0);
 	return NULL;
     }
 
@@ -169,7 +169,7 @@
     if (expected_encoding != ZIP_ENCODING_UNKNOWN) {
 	if (_zip_guess_encoding(s, expected_encoding) == ZIP_ENCODING_ERROR) {
 	    _zip_string_free(s);
-	    _zip_error_set(error, ZIP_ER_INVAL, 0);
+	    zip_error_set(error, ZIP_ER_INVAL, 0);
 	    return NULL;
 	}
     }
@@ -178,11 +178,11 @@
 }
 
 
-void
-_zip_string_write(const struct zip_string *s, FILE *f)
+int
+_zip_string_write(zip_t *za, const zip_string_t *s)
 {
     if (s == NULL)
-	return;
+	return 0;
     
-    fwrite(s->raw, s->length, 1, f);
+    return _zip_write(za, s->raw, s->length);
 }