ncd: NCDModule: rename NCDModuleInst callbacks to reflect they are not event-context handlers but

callbacks which can respond only via jobs

ncd/NCDModule.c

@@ -49,8 +49,7 @@
 
 static void frontend_event (NCDModuleInst *n, int event)
 {
-    n->handler_event(n->user, event);
-    return;
+    n->func_event(n->user, event);
 }
 
 static void init_job_handler (NCDModuleInst *n)
@@ -136,10 +135,10 @@ static void process_event_job_handler (NCDModuleProcess *o)
 }
 
 void NCDModuleInst_Init (NCDModuleInst *n, const struct NCDModule *m, NCDModuleInst *method_object, NCDValue *args, BReactor *reactor, BProcessManager *manager, NCDUdevManager *umanager, void *user,
-                         NCDModule_handler_event handler_event,
-                         NCDModule_handler_getvar handler_getvar,
-                         NCDModule_handler_getobj handler_getobj,
-                         NCDModule_handler_initprocess handler_initprocess,
+                         NCDModuleInst_func_event func_event,
+                         NCDModuleInst_func_getvar func_getvar,
+                         NCDModuleInst_func_getobj func_getobj,
+                         NCDModuleInst_func_initprocess func_initprocess,
                          BLog_logfunc logfunc)
 {
     // init arguments
@@ -150,10 +149,10 @@ void NCDModuleInst_Init (NCDModuleInst *n, const struct NCDModule *m, NCDModuleI
     n->manager = manager;
     n->umanager = umanager;
     n->user = user;
-    n->handler_event = handler_event;
-    n->handler_getvar = handler_getvar;
-    n->handler_getobj = handler_getobj;
-    n->handler_initprocess = handler_initprocess;
+    n->func_event = func_event;
+    n->func_getvar = func_getvar;
+    n->func_getobj = func_getobj;
+    n->func_initprocess = func_initprocess;
     n->logfunc = logfunc;
     
     // init jobs
@@ -357,7 +356,7 @@ int NCDModuleInst_Backend_GetVar (NCDModuleInst *n, const char *varname, NCDValu
            n->state == STATE_DYING)
     ASSERT(varname)
     
-    int res = n->handler_getvar(n->user, varname, out);
+    int res = n->func_getvar(n->user, varname, out);
     ASSERT(res == 0 || res == 1)
     
     return res;
@@ -371,7 +370,7 @@ NCDModuleInst * NCDModuleInst_Backend_GetObj (NCDModuleInst *n, const char *objn
            n->state == STATE_DYING)
     ASSERT(objname)
     
-    return n->handler_getobj(n->user, objname);
+    return n->func_getobj(n->user, objname);
 }
 
 void NCDModuleInst_Backend_Log (NCDModuleInst *n, int channel, int level, const char *fmt, ...)
@@ -419,7 +418,7 @@ int NCDModuleProcess_Init (NCDModuleProcess *o, NCDModuleInst *n, const char *te
     o->interp_func_event = NULL;
     
     // init interpreter part
-    if (!(n->handler_initprocess(n->user, o, template_name, args))) {
+    if (!(n->func_initprocess(n->user, o, template_name, args))) {
         goto fail1;
     }
     

ncd/NCDModule.h

@@ -41,10 +41,10 @@
 struct NCDModuleInst_s;
 struct NCDModuleProcess_s;
 
-typedef void (*NCDModule_handler_event) (void *user, int event);
-typedef int (*NCDModule_handler_getvar) (void *user, const char *varname, NCDValue *out);
-typedef struct NCDModuleInst_s * (*NCDModule_handler_getobj) (void *user, const char *objname);
-typedef int (*NCDModule_handler_initprocess) (void *user, struct NCDModuleProcess_s *p, const char *template_name, NCDValue args);
+typedef void (*NCDModuleInst_func_event) (void *user, int event);
+typedef int (*NCDModuleInst_func_getvar) (void *user, const char *varname, NCDValue *out);
+typedef struct NCDModuleInst_s * (*NCDModuleInst_func_getobj) (void *user, const char *objname);
+typedef int (*NCDModuleInst_func_initprocess) (void *user, struct NCDModuleProcess_s *p, const char *template_name, NCDValue args);
 
 #define NCDMODULEPROCESS_EVENT_UP 1
 #define NCDMODULEPROCESS_EVENT_DOWN 2
@@ -75,10 +75,10 @@ typedef struct NCDModuleInst_s {
     BProcessManager *manager;
     NCDUdevManager *umanager;
     void *user;
-    NCDModule_handler_event handler_event;
-    NCDModule_handler_getvar handler_getvar;
-    NCDModule_handler_getobj handler_getobj;
-    NCDModule_handler_initprocess handler_initprocess;
+    NCDModuleInst_func_event func_event;
+    NCDModuleInst_func_getvar func_getvar;
+    NCDModuleInst_func_getobj func_getobj;
+    NCDModuleInst_func_initprocess func_initprocess;
     BLog_logfunc logfunc;
     BPending init_job;
     BPending uninit_job;
@@ -104,10 +104,10 @@ typedef struct NCDModuleProcess_s {
 } NCDModuleProcess;
 
 void NCDModuleInst_Init (NCDModuleInst *n, const struct NCDModule *m, NCDModuleInst *method_object, NCDValue *args, BReactor *reactor, BProcessManager *manager, NCDUdevManager *umanager, void *user,
-                         NCDModule_handler_event handler_event,
-                         NCDModule_handler_getvar handler_getvar,
-                         NCDModule_handler_getobj handler_getobj,
-                         NCDModule_handler_initprocess handler_initprocess,
+                         NCDModuleInst_func_event func_event,
+                         NCDModuleInst_func_getvar func_getvar,
+                         NCDModuleInst_func_getobj func_getobj,
+                         NCDModuleInst_func_initprocess func_initprocess,
                          BLog_logfunc logfunc);
 void NCDModuleInst_Free (NCDModuleInst *n);
 void NCDModuleInst_Event (NCDModuleInst *n, int event);

ncd/ncd.c

@@ -1107,10 +1107,10 @@ void process_advance_job_handler (struct process *p)
     // initialize module instance
     NCDModuleInst_Init(
         &ps->inst, module, method_object, &ps->inst_args, &ss, &manager, &umanager, ps,
-        (NCDModule_handler_event)process_statement_instance_handler_event,
-        (NCDModule_handler_getvar)process_statement_instance_handler_getvar,
-        (NCDModule_handler_getobj)process_statement_instance_handler_getobj,
-        (NCDModule_handler_initprocess)process_statement_instance_handler_initprocess,
+        (NCDModuleInst_func_event)process_statement_instance_handler_event,
+        (NCDModuleInst_func_getvar)process_statement_instance_handler_getvar,
+        (NCDModuleInst_func_getobj)process_statement_instance_handler_getobj,
+        (NCDModuleInst_func_initprocess)process_statement_instance_handler_initprocess,
         (BLog_logfunc)process_statement_instance_logfunc
     );