From b6c537f6aeead793c1255e0bcc952cb15ad3bb20 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Thu, 22 Sep 2005 14:01:57 +0000 Subject: [PATCH] Used feedback string type plugin when no loaded. JP context killer. --- org.glite.jp.common/interface/context.h | 1 + org.glite.jp.common/src/attr.c | 2 +- org.glite.jp.common/src/context.c | 8 +++++++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/org.glite.jp.common/interface/context.h b/org.glite.jp.common/interface/context.h index 20effb2..40ae2eb 100644 --- a/org.glite.jp.common/interface/context.h +++ b/org.glite.jp.common/interface/context.h @@ -2,6 +2,7 @@ #define __GLITE_JP_CONTEXT int glite_jp_init_context(glite_jp_context_t *); +void glite_jp_free_context(glite_jp_context_t); void glite_jp_free_query_rec(glite_jp_query_rec_t *); char *glite_jp_peer_name(glite_jp_context_t); diff --git a/org.glite.jp.common/src/attr.c b/org.glite.jp.common/src/attr.c index c8f6ff3..aef6285 100644 --- a/org.glite.jp.common/src/attr.c +++ b/org.glite.jp.common/src/attr.c @@ -121,7 +121,7 @@ static glite_jp_tplug_data_t *get_plugin(glite_jp_context_t ctx,const char *anam void **cp = ctx->type_plugins; char *colon,*ns; - assert(cp); + if (!cp) return &fallback_plugin; glite_jp_clear_error(ctx); ns = strdup(aname); colon = strrchr(ns,':'); diff --git a/org.glite.jp.common/src/context.c b/org.glite.jp.common/src/context.c index fc7b0bf..adb4132 100644 --- a/org.glite.jp.common/src/context.c +++ b/org.glite.jp.common/src/context.c @@ -6,7 +6,13 @@ int glite_jp_init_context(glite_jp_context_t *ctx) { - *ctx = calloc(1,sizeof **ctx); + return (*ctx = calloc(1,sizeof **ctx)) != NULL; +} + +void glite_jp_free_context(glite_jp_context_t ctx) +{ + glite_jp_clear_error(ctx); + free(ctx); } char *glite_jp_peer_name(glite_jp_context_t ctx) -- 1.8.2.3