X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Fpasswddb.c;h=b3d6936289263666f8e4337723ca57e71656b101;hb=886253fb90810e512cacf4f02694645ead7a22e0;hp=4595f438cc3ece5e9d8e04d0d7a3c74acfcc6e0c;hpb=e02a2ef3bba24dbbbb00988c368f461ab49b3dc6;p=idzebra-moved-to-github.git

diff --git a/util/passwddb.c b/util/passwddb.c
index 4595f43..b3d6936 100644
--- a/util/passwddb.c
+++ b/util/passwddb.c
@@ -1,17 +1,26 @@
 /*
- * Copyright (C) 1998, Index Data ApS
+ * Copyright (C) 1998-1999, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: passwddb.c,v $
- * Revision 1.3  1998-06-25 19:16:32  adam
+ * Revision 1.6  1999-11-30 13:48:04  adam
+ * Improved installation. Updated for inclusion of YAZ header files.
+ *
+ * Revision 1.5  1999/05/26 07:49:14  adam
+ * C++ compilation.
+ *
+ * Revision 1.4  1999/02/02 14:51:39  adam
+ * Updated WIN32 code specific sections. Changed header.
+ *
+ * Revision 1.3  1998/06/25 19:16:32  adam
  * Minor changes to Visual C++ project.
  *
  * Revision 1.2  1998/06/25 09:55:51  adam
  * Minor changes - fixex headers.
  *
  */
-#ifdef WINDOWS
+#ifdef WIN32
 #else
 #include <unistd.h>
 #endif
@@ -26,8 +35,8 @@
 #include <crypt.h>
 #endif
 
-#include <log.h>
-#include <xmalloc.h>
+#include <yaz/log.h>
+#include <yaz/xmalloc.h>
 
 #include <passwddb.h>
 
@@ -43,7 +52,7 @@ struct passwd_db {
 
 Passwd_db passwd_db_open (void)
 {
-	struct passwd_db *p = xmalloc (sizeof(*p));
+	struct passwd_db *p = (struct passwd_db *) xmalloc (sizeof(*p));
 	p->entries = 0;
 	return p;
 }
@@ -83,7 +92,7 @@ int passwd_db_file (Passwd_db db, const char *fname)
 		get_entry (&cp, name, 128);
 		get_entry (&cp, des, 128);
 
-		pe = xmalloc (sizeof(*pe));
+		pe = (struct passwd_entry *) xmalloc (sizeof(*pe));
 		pe->name = xstrdup (name);
 		pe->des = xstrdup (des);
 		pe->next = db->entries;