Tiny fixes

diff --git a/Makefile.omk b/Makefile.omk
index fdce5dc155822888e57e810eee3d242dbd57e66b..023bcd7f456c295eed6ea7e3dd3a0c447993ea7e 100644 (file)
--- a/Makefile.omk
+++ b/Makefile.omk
@@ -40,7 +40,7 @@ config_include_HEADERS = forb/config.h
 config_DEFINES = CONFIG_FORB_PROTO_UNIX \
                 CONFIG_FORB_RECV_BUF_SIZE
 
-include-pass_HOOKS = log_domains.inc request_gavl.inc
+include-pass_HOOKS = log_domains.inc #request_gavl.inc
 
 log_domains.inc:
        @echo "  UL_LOG  $@"
@@ -49,8 +49,8 @@ log_domains.inc:
 clean-custom:
        $(Q)rm log_domains.inc
 
-request_gavl.inc: $(SOURCES_DIR)/request_gavl.c
-       @echo "  CPP     $@"
-       $(Q)$(c_o_COMPILE) -o $@.tmp -E $<
-       $(Q)tail -n 1 $@.tmp|indent > $@
+# request_gavl.inc: $(SOURCES_DIR)/request_gavl.c
+#      @echo "  CPP     $@"
+#      $(Q)$(c_o_COMPILE) -o $@.tmp -E $<
+#      $(Q)tail -n 1 $@.tmp|indent > $@
 

diff --git a/forb.c b/forb.c
index 89ff20a763596b22cea266048bd50e80d1e9cb7e..6c953d9a222f02b8474f7854af97f6bbf15b04c0 100644 (file)
--- a/forb.c
+++ b/forb.c
@@ -112,6 +112,7 @@ forb_object_new(forb_orb orb,
                memset(obj, 0, sizeof(*obj));
                obj->orb = orb;
                if (key == 0) {
+#warning Rework objkeys to something different than address
                        obj->objkey = (forb_object_key)(unsigned)obj;
                } else {
                        obj->objkey = key;

diff --git a/request.c b/request.c
index 44aae4d96cb368f85fd3dd1ece0911bc4a7d882b..8b641689e4d802efe7b80f70bff8d945568fa543 100644 (file)
--- a/request.c
+++ b/request.c
@@ -9,7 +9,7 @@ static inline int forb_request_cmp(CORBA_unsigned_long *a, CORBA_unsigned_long *
                 0);
 }
 
-#if 0
+#if 1
 GAVL_CUST_NODE_INT_IMP(forb_request_nolock /* cust_prefix */,
                       forb_t /* cust_root_t */,
                       forb_request_t /* cust_item_t */,

diff --git a/request.h b/request.h
index a860c9a4dbe0c0f2425c5053a8336d05f5d84d86..fffa0d85fce8b3e1df8523348833e63c736728f2 100644 (file)
--- a/request.h
+++ b/request.h
@@ -17,7 +17,7 @@ struct forb_request {
        CDR_Codec *cdr_reply;
        gavl_node_t node;
        forb_object obj;
-       struct forb_env *env;   /**< Where to stere exception returned in reply */
+       struct forb_env *env;   /**< Where to store exception returned in reply */
        forb_syncobj_t reply_ready; /**< Synchronization object for waiting for reply */
        forb_syncobj_t *reply_processed; /**< Synchronization object for receiver thread to wait for stub. */
 };