All sorts of changes for ver 0.2

1 files changed, 5 insertions, 6 deletions

diff --git a/lib/ZFmtRaw.c b/lib/ZFmtRaw.c
index 28f5dff..03955b2 100644
--- a/lib/ZFmtRaw.c
+++ b/lib/ZFmtRaw.c
@@ -18,21 +18,19 @@ static char rcsid_ZFormatRawNotice_c[] = "$Header$";
 
 #include <zephyr/mit-copyright.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/zephyr_internal.h>
 
-Code_t ZFormatRawNotice(notice, buffer, ret_len, cert_routine)
+Code_t ZFormatRawNotice(notice, buffer, ret_len)
     ZNotice_t *notice;
     char **buffer;
     int *ret_len;
-    int (*cert_routine)();
 {
     char header[Z_MAXHEADERLEN];
-    char *ptr;
     int hdrlen;
     Code_t retval;
 
-    if ((retval = Z_FormatRawHeader(notice, header, sizeof(header), &hdrlen, 
-				    cert_routine)) != ZERR_NONE)
+    if ((retval = Z_FormatRawHeader(notice, header, sizeof(header), &hdrlen))
+	!= ZERR_NONE)
 	return (retval);
 
     *ret_len = hdrlen+notice->z_message_len;
@@ -40,6 +38,7 @@ Code_t ZFormatRawNotice(notice, buffer, ret_len, cert_routine)
     if (!(*buffer = malloc(*ret_len)))
 	return (ENOMEM);
 
+    bcopy(header, *buffer, hdrlen);
     bcopy(notice->z_message, *buffer+hdrlen, notice->z_message_len);
 
     return (ZERR_NONE);