Changeset 104485 in vbox

Timestamp:

May 2, 2024 4:28:55 PM (9 months ago)

Author:

vboxsync

Message:

libs/xpcom/typelib: Some cleanups, bugref:3409

Location:

trunk/src/libs/xpcom18a4/xpcom/typelib

Files:

• xpidl/xpidl_header.c (modified) (3 diffs)
• xpidl/xpidl_typelib.c (modified) (6 diffs)
• xpt/src/xpt_struct.c (modified) (2 diffs)
• xpt/src/xpt_xdr.c (modified) (1 diff)
• xpt/tools/xpt_link.c (modified) (1 diff)

trunk/src/libs/xpcom18a4/xpcom/typelib/xpidl/xpidl_header.c

@@ -253 +253 @@
     fputs(" {\n"
           " public: \n\n", state->file);
-    if (iid) {
-        fputs("  NS_DEFINE_STATIC_IID_ACCESSOR(", state->file);
-        write_classname_iid_define(state->file, className);
-        fputs(")\n\n", state->file);
-    }
+
+    fputs("  NS_DEFINE_STATIC_IID_ACCESSOR(", state->file);
+    write_classname_iid_define(state->file, className);
+    fputs(")\n\n", state->file);
 
     orig = state->tree; /* It would be nice to remove this state-twiddling. */
@@ -1137 +1136 @@
     const char *desc = IDL_CODEFRAG(state->tree).desc;
     GSList *lines = IDL_CODEFRAG(state->tree).lines;
-    guint fragment_length;
-    
+
     if (strcmp(desc, "C++") && /* libIDL bug? */ strcmp(desc, "C++\r")) {
         XPIDL_WARNING((state->tree, IDL_WARNING1,
@@ -1155 +1153 @@
      * we backtrack to get the proper line for the beginning of the block.
      */
-    /*
-     * Looks like getting this right means maintaining an accurate line
-     * count of everything generated, so we can set the file back to the
-     * correct line in the generated file afterwards.  Skipping for now...
-     */
-
-    fragment_length = g_slist_length(lines);
-/*      fprintf(state->file, "#line %d \"%s\"\n", */
-/*              state->tree->_line - fragment_length - 1, */
-/*              state->tree->_file); */
-
     g_slist_foreach(lines, write_codefrag_line, (gpointer)state);
 

trunk/src/libs/xpcom18a4/xpcom/typelib/xpidl/xpidl_typelib.c

@@ -130 +130 @@
 {
     TreeState *state = user_data;
-    IDL_tree up;
     if (IDL_NODE_TYPE(tfd->tree) == IDLN_IDENT) {
-        IDL_tree_type node_type = IDL_NODE_TYPE((up = IDL_NODE_UP(tfd->tree)));
+        IDL_tree_type node_type = IDL_NODE_TYPE(IDL_NODE_UP(tfd->tree));
         if (node_type == IDLN_INTERFACE || node_type == IDLN_FORWARD_DCL) {
 
@@ -168 +167 @@
 #endif
             }
-        } else {
-#ifdef DEBUG_shaver_ifaces
-            fprintf(stderr, "ident %s isn't an interface (%s)\n",
-                    IDL_IDENT(tfd->tree).str, IDL_NODE_TYPE_NAME(up));
-#endif
         }
     }
@@ -278 +272 @@
     const XPTInterfaceDirectoryEntry *a = ap, *b = bp;
     const nsID *aid = &a->iid, *bid = &b->iid;
-    const char *ans, *bns;
 
     int i;
@@ -289 +282 @@
         COMPARE(m3[i]);
     }
-
-    /* defend against NULL name_space by using empty string. */
-    ans = a->name_space ? a->name_space : "";
-    bns = b->name_space ? b->name_space : "";
 
     if (a->name_space && b->name_space) {
@@ -848 +837 @@
                 break;
               }
-              case IDLN_NATIVE: {
-                  char *ident;
+              case IDLN_NATIVE:
+              {
 
                   /* jband - adding goto for iid_is when type is native */
@@ -857 +846 @@
                       goto handle_iid_is;
 
-                  ident = IDL_IDENT(type).str;
                   if (IDL_tree_property_get(type, "nsid")) {
                       td->prefix.flags = TD_PNSIID;

trunk/src/libs/xpcom18a4/xpcom/typelib/xpt/src/xpt_struct.c

@@ -280 +280 @@
      * the stack on large xpt files.
      */
-    ann = next = header->annotations;
+    next = header->annotations;
     annp = &header->annotations;
     do {
@@ -937 +937 @@
 
 static XPT_TYPELIB_VERSIONS_STRUCT versions[] = XPT_TYPELIB_VERSIONS;
-#define XPT_TYPELIB_VERSIONS_COUNT (sizeof(versions) / sizeof(versions[0]))
 
 XPT_PUBLIC_API(PRUint16)
 XPT_ParseVersionString(const char* str, PRUint8* major, PRUint8* minor)
 {
-    int i;
-    for (i = 0; i < XPT_TYPELIB_VERSIONS_COUNT; i++) {
+    for (uint32_t i = 0; i < RT_ELEMENTS(versions); i++) {
         if (!strcmp(versions[i].str, str)) {
             *major = versions[i].major;

trunk/src/libs/xpcom18a4/xpcom/typelib/xpt/src/xpt_xdr.c

@@ -214 +214 @@
     XPT_DELETE(arena, state);
  err_free_arena:
-    if (arena)
-        XPT_DestroyArena(arena);
+    XPT_DestroyArena(arena);
     return NULL;
 }

trunk/src/libs/xpcom18a4/xpcom/typelib/xpt/tools/xpt_link.c

@@ -240 +240 @@
             
             state = XPT_NewXDRState(XPT_DECODE, whole, flen);
+            if (!state)
+            {
+                fprintf(stdout, "XPT_NewXDRState failed for %s\n", name);
+                return 1;
+            }
             if (!XPT_MakeCursor(state, XPT_HEADER, 0, cursor)) {
                 fprintf(stdout, "XPT_MakeCursor failed for %s\n", name);