Shorten names of implementation structure to impl

diff --git a/forb-idl/forb-idl-c-headers.c b/forb-idl/forb-idl-c-headers.c
index 959037db5d3cfef0a88549f3ae2b413846119957..7b52e022d223dc0799052bf07a3460d6c2df67a2 100644 (file)
--- a/forb-idl/forb-idl-c-headers.c
+++ b/forb-idl/forb-idl-c-headers.c
@@ -415,7 +415,7 @@ ch_output_impl_struct(IDL_tree tree, OIDL_Run_Info *rinfo, OIDL_C_Info *ci)
 {
     char *fullname;
     fullname = forb_cbe_get_typespec_str(tree);
-    fprintf(ci->fh, "struct forb_%s_implementation {\n", fullname);
+    fprintf(ci->fh, "struct forb_%s_impl {\n", fullname);
     ch_output_impl_struct_members(tree, rinfo, ci);
     fprintf(ci->fh, "};\n\n");
     g_free(fullname);
@@ -444,7 +444,7 @@ ch_output_interface(IDL_tree tree, OIDL_Run_Info *rinfo, OIDL_C_Info *ci)
 
        fprintf(ci->fh, "void forb_register_%s_interface(void);\n", fullname);
        fprintf(ci->fh, "%s forb_%s_new(void *instance_data,\n"
-                       "               const struct forb_%s_implementation *impl);\n\n",
+                       "               const struct forb_%s_impl *impl);\n\n",
                fullname, fullname, fullname);
        
        /* ch_type_alloc_and_tc(tree, rinfo, ci, FALSE); */

diff --git a/forb-idl/forb-idl-c-skels.c b/forb-idl/forb-idl-c-skels.c
index 3dcf00a38468e2c753a7840e2579e6dd8fac28bd..5fc010b36a6eeb8f30b572e6c7a024401ee15e5c 100644 (file)
--- a/forb-idl/forb-idl-c-skels.c
+++ b/forb-idl/forb-idl-c-skels.c
@@ -313,7 +313,7 @@ cbe_skel_do_interface(IDL_tree tree, OIDL_Run_Info *rinfo, OIDL_C_Info *ci)
 
   id = IDL_ns_ident_to_qstring(IDL_IDENT_TO_NS(IDL_INTERFACE(tree).ident), "_", 0);
 
-  fprintf(ci->fh, "#define _%s_impl(obj) ((struct forb_%s_implementation*)(obj)->implementation)\n\n", id, id);
+  fprintf(ci->fh, "#define _%s_impl(obj) ((struct forb_%s_impl*)(obj)->implementation)\n\n", id, id);
   fprintf(ci->fh, "static const struct forb_interface %s_interface;\n\n", id);
   
   for(sub = IDL_INTERFACE(tree).body; sub; sub = IDL_LIST(sub).next) {
@@ -361,7 +361,7 @@ cbe_skel_do_interface(IDL_tree tree, OIDL_Run_Info *rinfo, OIDL_C_Info *ci)
                  "}\n\n", id, id);
 
   fprintf(ci->fh, "%s forb_%s_new(void *instance_data, "
-                 "const struct forb_%s_implementation *impl)\n"
+                 "const struct forb_%s_impl *impl)\n"
                  "{\n"
                  "  %s obj = forb_malloc(sizeof(*obj));\n"
                  "  if (obj) {\n"

diff --git a/forb-idl/forb-idl-c-stubs.c b/forb-idl/forb-idl-c-stubs.c
index 9729ed9708695319f9a57fa6d2faf1de37e3fb6c..75c66a62ac7ae469b4e75654f37ae640cdd45004 100644 (file)
--- a/forb-idl/forb-idl-c-stubs.c
+++ b/forb-idl/forb-idl-c-stubs.c
@@ -158,7 +158,7 @@ cs_output_stubs (IDL_tree     tree,
                int real_idx = 0;
                char *id;
                id = IDL_ns_ident_to_qstring (IDL_INTERFACE (tree).ident, "_", 0);
-               fprintf(ci->fh, "#define _%s_impl(obj) ((struct forb_%s_implementation*)(obj)->implementation)\n\n",
+               fprintf(ci->fh, "#define _%s_impl(obj) ((struct forb_%s_impl*)(obj)->implementation)\n\n",
                        id, id);
                g_free(id);
                cs_output_stubs (IDL_INTERFACE (tree).body, ci, &real_idx);

diff --git a/tests/hello_impl.c b/tests/hello_impl.c
index ccae535a4e70c94e6aea5357318c54f22115bbf5..5afc52abdfc635791cec1796dd87dfadcdfd7afc 100644 (file)
--- a/tests/hello_impl.c
+++ b/tests/hello_impl.c
@@ -6,7 +6,7 @@ static void message(hello _obj, const CORBA_char * msg, CORBA_Environment *ev)
        printf("Hello object received: %s\n", msg);
 }
 
-static const struct forb_hello_implementation impl = {
+static const struct forb_hello_impl impl = {
        message
 };