summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos <nmav@crystal.(none)>2007-11-28 20:57:24 +0200
committerNikos <nmav@crystal.(none)>2007-11-28 20:57:24 +0200
commit509119cb935162c3a00f083569dce0ad0602b927 (patch)
treee20a9d3ff8f7f780bcd402aab3d7c21b2057081d
parenta05d9548df39c534cb736266e6d651548fefcc19 (diff)
downloadgnutls-509119cb935162c3a00f083569dce0ad0602b927.tar.gz
more updates for priority functions.
-rw-r--r--includes/gnutls/gnutls.h.in4
-rw-r--r--lib/gnutls_priority.c10
2 files changed, 7 insertions, 7 deletions
diff --git a/includes/gnutls/gnutls.h.in b/includes/gnutls/gnutls.h.in
index 317dcd24cf..c043c6fd94 100644
--- a/includes/gnutls/gnutls.h.in
+++ b/includes/gnutls/gnutls.h.in
@@ -512,11 +512,11 @@ extern "C"
/* if you just want some defaults, use the following.
*/
- int gnutls_priority_init( gnutls_priority_t*, const char *priority, char* syntax_error, size_t syntax_error_size);
+ int gnutls_priority_init( gnutls_priority_t*, const char *priority, const char** err_pos);
void gnutls_priority_deinit( gnutls_priority_t);
int gnutls_priority_set(gnutls_session_t session, gnutls_priority_t);
- int gnutls_priority_set_direct(gnutls_session_t session, const char *priority, char* syntax_error, size_t syntax_error_size);
+ int gnutls_priority_set_direct(gnutls_session_t session, const char *priority, const char** err_pos);
/* for compatibility
*/
diff --git a/lib/gnutls_priority.c b/lib/gnutls_priority.c
index 9ac24b09b3..2fc3c32269 100644
--- a/lib/gnutls_priority.c
+++ b/lib/gnutls_priority.c
@@ -484,7 +484,7 @@ gnutls_priority_init (gnutls_priority_t * priority_cache,
const char *priorities, const char **err_pos)
{
char *broken_list[MAX_ELEMENTS];
- int broken_list_size, i;
+ int broken_list_size, i, j;
char *darg;
int algo;
rmadd_func *fn;
@@ -712,7 +712,7 @@ break_comma_list (char *etag,
*
* This is the same as calling:
*
- * gnutls_priority_set_direct (session, "EXPORT", NULL, 0);
+ * gnutls_priority_set_direct (session, "EXPORT", NULL);
*
* This function is kept around for backwards compatibility, but
* because of its wide use it is still fully supported. If you wish
@@ -725,7 +725,7 @@ break_comma_list (char *etag,
int
gnutls_set_default_priority (gnutls_session_t session)
{
- return gnutls_priority_set_direct (session, "NORMAL", NULL, 0);
+ return gnutls_priority_set_direct (session, "NORMAL", NULL);
}
/**
@@ -737,7 +737,7 @@ gnutls_set_default_priority (gnutls_session_t session)
*
* This is the same as calling:
*
- * gnutls_priority_set_direct (session, "EXPORT", NULL, 0);
+ * gnutls_priority_set_direct (session, "EXPORT", NULL);
*
* This function is kept around for backwards compatibility, but
* because of its wide use it is still fully supported. If you wish
@@ -750,5 +750,5 @@ gnutls_set_default_priority (gnutls_session_t session)
int
gnutls_set_default_export_priority (gnutls_session_t session)
{
- return gnutls_priority_set_direct (session, "EXPORT", NULL, 0);
+ return gnutls_priority_set_direct (session, "EXPORT", NULL);
}