From c1c9f9e7367dde9a1f0e5ece4c0bd8dac3d04d8b Mon Sep 17 00:00:00 2001 From: Rongsong Shen Date: Tue, 14 Apr 2026 12:52:40 +0800 Subject: [PATCH] minor improve --- src/lib/resobj.c | 2 +- src/lib/xcelimit.c | 5 +---- src/lib/zarray.c | 2 +- src/scheduler/src/scheduler.c | 3 ++- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/lib/resobj.c b/src/lib/resobj.c index 6ed34f6d..aa0b4aa2 100644 --- a/src/lib/resobj.c +++ b/src/lib/resobj.c @@ -126,7 +126,7 @@ static xce_resource_t* makeResource_(var resmgr, xce_resource_t* r) resobj = makeInstance(&resobj_type, r); if (resobj != NULL) { rc = key_add(resmgr, (void*)resobj->name, (void*)resobj); - + if (rc < 0) { destroy(resobj); diff --git a/src/lib/xcelimit.c b/src/lib/xcelimit.c index 43aa917a..7d8100ac 100644 --- a/src/lib/xcelimit.c +++ b/src/lib/xcelimit.c @@ -308,7 +308,6 @@ int build_vres_name(char** vname, xce_limit_t* limit, char* user, char* queue, size_t bufsize = 0; FILE* fp = NULL; xce_consumer_t* c = NULL; - int rc = 0; *vname = NULL; if ((vname == NULL) || (limit == NULL) || (user == NULL) || (queue == NULL) @@ -339,10 +338,8 @@ int build_vres_name(char** vname, xce_limit_t* limit, char* user, char* queue, fprintf(fp, "/p=%s", project); } - fflush(fp); - fclose(fp); - + if ((*vname) != NULL) { return 1; } diff --git a/src/lib/zarray.c b/src/lib/zarray.c index 29c660d6..32133a7f 100644 --- a/src/lib/zarray.c +++ b/src/lib/zarray.c @@ -447,7 +447,7 @@ static int xzarray_ensure_items(xzarray_t* array, int mincap) if (array->data[array->pos].inuse) { array->pos = array->caps; } - + array->caps = nc; return 1; diff --git a/src/scheduler/src/scheduler.c b/src/scheduler/src/scheduler.c index 21952f72..46b411a3 100644 --- a/src/scheduler/src/scheduler.c +++ b/src/scheduler/src/scheduler.c @@ -476,7 +476,8 @@ static int sched_init_resources(xce_scheduler_t* sched) r1 = makeResource(sched->resmgr, r); if (r1 == NULL) { - ERROR("%s add resource %s failed", __func__, r->name); + ERROR("%s add resource %s failed", __func__, + r->name ? r->name : "(null)"); } } return 0;