[svn] ksba - r292 - trunk/src
svn author wk
cvs at cvs.gnupg.org
Thu Sep 4 11:52:37 CEST 2008
Author: wk
Date: 2008-09-04 11:52:37 +0200 (Thu, 04 Sep 2008)
New Revision: 292
Modified:
trunk/src/ChangeLog
trunk/src/asn1-func.c
trunk/src/asn1-func.h
trunk/src/asn1-func2.c
trunk/src/cms.c
trunk/src/visibility.c
trunk/src/visibility.h
Log:
Fix a visibility problem.
Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog 2008-03-17 09:55:50 UTC (rev 291)
+++ trunk/src/ChangeLog 2008-09-04 09:52:37 UTC (rev 292)
@@ -1,3 +1,14 @@
+2008-09-04 Werner Koch <wk at g10code.com>
+
+ * asn1-func.h (ksba_asn_create_structure): Remove unused prototype
+ (ksba_asn1_create_tree): Ditto.
+ (ksba_asn_read_value, ksba_asn_write_value): Ditto.
+
+ * asn1-func.c (ksba_asn_delete_structure): Prefix name with underscore.
+ * visibility.h (ksba_asn_delete_structure): Remove macros.
+ (MARK_VISIBLEX): New.
+ (ksba_asn_delete_structure): New.
+
2008-03-17 Werner Koch <wk at g10code.com>
* cert.c (ksba_cert_get_image): Fix size_t/int format mismatch.
@@ -23,7 +34,7 @@
* keyinfo.c (pkalgo_t): New.
(algo_table_s): Add fields PARMELEM_STRING and
- PARMCTRL_STRING. repalce IS-ECC by PKALGO. Adjust all tables and
+ PARMCTRL_STRING. Replace IS_ECC by PKALGO. Adjust all tables and
users of IS_ECC. Add DSA parameter description.
(TLV_LENGTH): Add PREFIX arg and change all callers.
(_ksba_keyinfo_to_sexp): Parse parameters.
Modified: trunk/src/asn1-func.c
===================================================================
--- trunk/src/asn1-func.c 2008-03-17 09:55:50 UTC (rev 291)
+++ trunk/src/asn1-func.c 2008-09-04 09:52:37 UTC (rev 292)
@@ -637,7 +637,7 @@
}
int
-ksba_asn_delete_structure (AsnNode root)
+_ksba_asn_delete_structure (AsnNode root)
{
AsnNode p, p2, p3;
Modified: trunk/src/asn1-func.h
===================================================================
--- trunk/src/asn1-func.h 2008-03-17 09:55:50 UTC (rev 291)
+++ trunk/src/asn1-func.h 2008-09-04 09:52:37 UTC (rev 292)
@@ -201,12 +201,7 @@
const void *oidbuf, size_t oidlen);
-int ksba_asn_create_structure (AsnNode root, char *source_name,
- AsnNode*pointer , char *dest_name);
-int ksba_asn_delete_structure (AsnNode root);
-int ksba_asn1_create_tree (const static_asn *root,AsnNode*pointer);
-int ksba_asn_read_value(AsnNode root,const char *name,unsigned char *value,int *len);
-int ksba_asn_write_value(AsnNode root,char *name,unsigned char *value,int len);
+int _ksba_asn_delete_structure (AsnNode root);
/*-- asn2-func.c --*/
Modified: trunk/src/asn1-func2.c
===================================================================
--- trunk/src/asn1-func2.c 2008-03-17 09:55:50 UTC (rev 291)
+++ trunk/src/asn1-func2.c 2008-09-04 09:52:37 UTC (rev 292)
@@ -208,7 +208,7 @@
rc = gpg_error (GPG_ERR_GENERAL);
if (rc)
- ksba_asn_delete_structure (pointer);
+ _ksba_asn_delete_structure (pointer);
return rc;
}
Modified: trunk/src/cms.c
===================================================================
--- trunk/src/cms.c 2008-03-17 09:55:50 UTC (rev 291)
+++ trunk/src/cms.c 2008-09-04 09:52:37 UTC (rev 292)
@@ -1329,7 +1329,7 @@
* Set the algorithm to be used for creating the hash. Note, that we
* currently can't do a per-signer hash.
*
- * Return value: o on success or an error code
+ * Return value: 0 on success or an error code
**/
gpg_error_t
ksba_cms_add_digest_algo (ksba_cms_t cms, const char *oid)
Modified: trunk/src/visibility.c
===================================================================
--- trunk/src/visibility.c 2008-03-17 09:55:50 UTC (rev 291)
+++ trunk/src/visibility.c 2008-09-04 09:52:37 UTC (rev 292)
@@ -1096,7 +1096,6 @@
}
-
/*-- asn1-func.c --*/
void
ksba_asn_tree_dump (ksba_asn_tree_t tree, const char *name, FILE *fp)
@@ -1112,6 +1111,17 @@
}
+/* This is a dummy function which we only include because it was
+ accidently put into the public interface. */
+int
+ksba_asn_delete_structure (void *dummy)
+{
+ (void)dummy;
+ fprintf (stderr, "BUG: ksba_asn_delete_structure called\n");
+ return -1;
+}
+
+
/*-- oid.c --*/
char *
ksba_oid_to_str (const char *buffer, size_t length)
Modified: trunk/src/visibility.h
===================================================================
--- trunk/src/visibility.h 2008-03-17 09:55:50 UTC (rev 291)
+++ trunk/src/visibility.h 2008-09-04 09:52:37 UTC (rev 292)
@@ -30,7 +30,6 @@
#define ksba_realloc _ksba_realloc
#define ksba_strdup _ksba_strdup
#define ksba_asn_create_tree _ksba_asn_create_tree
-#define ksba_asn_delete_structure _ksba_asn_delete_structure
#define ksba_asn_parse_file _ksba_asn_parse_file
#define ksba_asn_tree_dump _ksba_asn_tree_dump
#define ksba_asn_tree_release _ksba_asn_tree_release
@@ -199,23 +198,18 @@
# ifdef KSBA_USE_VISIBILITY
# define MARK_VISIBLE(name) \
extern __typeof__ (_##name) name _KSBA_VISIBILITY_DEFAULT;
+# define MARK_VISIBLEX(name) \
+ extern __typeof__ (name) name _KSBA_VISIBILITY_DEFAULT;
# else
-# define MARK_VISIBLE(name) /* */
+# define MARK_VISIBLE(name) /* */
+# define MARK_VISIBLEX(name) /* */
# endif
-/* Prototypes of functions though exported not yet officially known or
- only accidently put into the public interface. */
-struct asn_node_struct;
-#ifndef HAVE_TYPEDEFD_ASNNODE
- typedef struct asn_node_struct *AsnNode;
- typedef struct asn_node_struct *asn_node_t;
-# define HAVE_TYPEDEFD_ASNNODE
-#endif
-int ksba_asn_delete_structure (asn_node_t root);
+/* Prototype for a dummy function we once exported accidently. */
+int ksba_asn_delete_structure (void *dummy);
-
/* Undef all redefined symbols so that we set the attribute on the
exported name of the symbol. */
#undef ksba_check_version
@@ -227,7 +221,6 @@
#undef ksba_realloc
#undef ksba_strdup
#undef ksba_asn_create_tree
-#undef ksba_asn_delete_structure
#undef ksba_asn_parse_file
#undef ksba_asn_tree_dump
#undef ksba_asn_tree_release
@@ -386,10 +379,10 @@
MARK_VISIBLE (ksba_realloc)
MARK_VISIBLE (ksba_strdup)
MARK_VISIBLE (ksba_asn_create_tree)
-MARK_VISIBLE (ksba_asn_delete_structure)
MARK_VISIBLE (ksba_asn_parse_file)
MARK_VISIBLE (ksba_asn_tree_dump)
MARK_VISIBLE (ksba_asn_tree_release)
+MARK_VISIBLEX (ksba_asn_delete_structure) /* Dummy for ABI compatibility. */
MARK_VISIBLE (ksba_cert_get_auth_key_id)
MARK_VISIBLE (ksba_cert_get_cert_policies)
More information about the Gnupg-commits
mailing list