X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=client%2Fadmin.c;h=46cf777ea3f08188bc65e00896ca8fa243ded641;hb=e46cd1b274c0f3328ebb091fa61fb41352638778;hp=cfb2c93c2161a0c1e6dd5b2d725fee82b6bb2543;hpb=247a4ed52a51a1dbd85877438b86a39ca68a3cca;p=yaz-moved-to-github.git

diff --git a/client/admin.c b/client/admin.c
index cfb2c93..46cf777 100644
--- a/client/admin.c
+++ b/client/admin.c
@@ -1,6 +1,12 @@
 /*
  * $Log: admin.c,v $
- * Revision 1.8  2000-04-17 14:21:38  adam
+ * Revision 1.10  2001-07-19 19:51:41  adam
+ * Added typecasts to make C++ happy.
+ *
+ * Revision 1.9  2001/02/21 13:46:53  adam
+ * C++ fixes.
+ *
+ * Revision 1.8  2000/04/17 14:21:38  adam
  * WIN32 update.
  *
  * Revision 1.7  2000/04/05 07:39:54  adam
@@ -219,6 +225,7 @@ int cmd_adm_import(char *arg)
     struct dirent *ent;
     int chunk = 10;
     Z_APDU *apdu = 0;
+    Z_Segment *segment = 0;
     ODR out = getODROutputStream();
 
     if (arg && sscanf (arg, "%19s %1023s %1023s", type_str,
@@ -249,9 +256,8 @@ int cmd_adm_import(char *arg)
 
 	    if (S_ISREG(status.st_mode) && (inf = fopen(fname, "r")))
 	    {
-		Z_Segment *segment;
 		Z_NamePlusRecord *rec;
-		Odr_oct *oct = odr_malloc (out, sizeof(*oct));
+		Odr_oct *oct = (Odr_oct *) odr_malloc (out, sizeof(*oct));
 
 		if (!apdu)
 		{
@@ -270,7 +276,7 @@ int cmd_adm_import(char *arg)
 		rec->u.intermediateFragment->u.notExternallyTagged = oct;
 		
 		oct->len = oct->size = status.st_size;
-		oct->buf = odr_malloc (out, oct->size);
+		oct->buf = (unsigned char *) odr_malloc (out, oct->size);
 		fread (oct->buf, 1, oct->size, inf);
 		fclose (inf);