Re: heimdal & C++

[Assar Westerlund <assar@sics.se>]

Michal Vocu <michal@karlin.mff.cuni.cz> writes:
> Would it be possible, for the sake of portability, not to use C++
> keywords in the C source?

Sure.  These patches coming soon to a snapshot near you.

/assar

Index: lib/hdb/common.c
===================================================================
RCS file: /afs/pdc.kth.se/src/packages/kth-krb/SourceRepository/heimdal/lib/hdb/common.c,v
retrieving revision 1.3
diff -u -w -r1.3 common.c
--- common.c	1997/11/15 23:33:40	1.3
+++ common.c	1998/11/23 11:51:48
@@ -138,7 +138,7 @@
 }
 
 krb5_error_code
-_hdb_delete(krb5_context context, HDB *db, hdb_entry *entry)
+_hdb_remove(krb5_context context, HDB *db, hdb_entry *entry)
 {
     krb5_data key;
     int code;
Index: lib/hdb/db.c
===================================================================
RCS file: /afs/pdc.kth.se/src/packages/kth-krb/SourceRepository/heimdal/lib/hdb/db.c,v
retrieving revision 1.18
diff -u -w -r1.18 db.c
--- db.c	1997/11/12 00:47:52	1.18
+++ db.c	1998/11/23 11:51:51
@@ -239,7 +239,7 @@
     (*db)->close = DB_close;
     (*db)->fetch = _hdb_fetch;
     (*db)->store = _hdb_store;
-    (*db)->delete = _hdb_delete;
+    (*db)->remove = _hdb_remove;
     (*db)->firstkey = DB_firstkey;
     (*db)->nextkey= DB_nextkey;
     (*db)->lock = DB_lock;
Index: lib/hdb/hdb.h
===================================================================
RCS file: /afs/pdc.kth.se/src/packages/kth-krb/SourceRepository/heimdal/lib/hdb/hdb.h,v
retrieving revision 1.20
diff -u -w -r1.20 hdb.h
--- hdb.h	1997/11/02 04:09:46	1.20
+++ hdb.h	1998/11/23 11:50:00
@@ -58,7 +58,7 @@
     krb5_error_code (*close)(krb5_context, struct HDB*);
     krb5_error_code (*fetch)(krb5_context, struct HDB*, hdb_entry*);
     krb5_error_code (*store)(krb5_context, struct HDB*, int, hdb_entry*);
-    krb5_error_code (*delete)(krb5_context, struct HDB*, hdb_entry*);
+    krb5_error_code (*remove)(krb5_context, struct HDB*, hdb_entry*);
     krb5_error_code (*firstkey)(krb5_context, struct HDB*, hdb_entry*);
     krb5_error_code (*nextkey)(krb5_context, struct HDB*, hdb_entry*);
     krb5_error_code (*lock)(krb5_context, struct HDB*, int operation);
Index: lib/hdb/hdb_locl.h
===================================================================
RCS file: /afs/pdc.kth.se/src/packages/kth-krb/SourceRepository/heimdal/lib/hdb/hdb_locl.h,v
retrieving revision 1.8
diff -u -w -r1.8 hdb_locl.h
--- hdb_locl.h	1997/11/02 04:10:51	1.8
+++ hdb_locl.h	1998/11/23 11:51:55
@@ -81,6 +81,6 @@
 
 krb5_error_code _hdb_fetch(krb5_context, HDB*, hdb_entry*);
 krb5_error_code _hdb_store(krb5_context, HDB*, int, hdb_entry*);
-krb5_error_code _hdb_delete(krb5_context, HDB*, hdb_entry*);
+krb5_error_code _hdb_remove(krb5_context, HDB*, hdb_entry*);
 
 #endif /* __HDB_LOCL_H__ */
Index: lib/hdb/ndbm.c
===================================================================
RCS file: /afs/pdc.kth.se/src/packages/kth-krb/SourceRepository/heimdal/lib/hdb/ndbm.c,v
retrieving revision 1.20
diff -u -w -r1.20 ndbm.c
--- ndbm.c	1998/02/27 04:02:19	1.20
+++ ndbm.c	1998/11/23 11:52:03
@@ -290,7 +290,7 @@
     (*db)->close = NDBM_close;
     (*db)->fetch = _hdb_fetch;
     (*db)->store = _hdb_store;
-    (*db)->delete = _hdb_delete;
+    (*db)->remove = _hdb_remove;
     (*db)->firstkey = NDBM_firstkey;
     (*db)->nextkey= NDBM_nextkey;
     (*db)->lock = NDBM_lock;