xpcom

Timestamp:

Jul 22, 2016 2:54:18 PM (8 years ago)

Author:

vboxsync

Message:

src/libs/xpcom: drop using the deprecated g_basename() function and use g_path_get_basename() instead

Location:

trunk/src/libs/xpcom18a4/xpcom/typelib/xpidl

Files:

trunk/src/libs/xpcom18a4/xpcom/typelib/xpidl/xpidl.h

-              r29118
+              r62449
 /*
+ * Return a pointer to the start of the base filename of path
+ */
+const char *
+ * Return a newly allocated string to the start of the base filename of path.
+ * Free with g_free().
+ */
+char *
 xpidl_basename(const char * path);

-              r1
+              r62449
 header_prolog(TreeState *state)
+{
     const char *define = xpidl_basename(state->basename);
+    char *define = xpidl_basename(state->basename);
     fprintf(state->file, "/*\n * DO NOT EDIT.  THIS FILE IS GENERATED FROM"
             " %s.idl\n */\n", state->basename);
 …
             "#define __gen_%s_h__\n",
             define, define);
+    g_free(define);
     if (state->base_includes != NULL) {
         guint len = g_slist_length(state->base_includes);
 …
 header_epilog(TreeState *state)
+{
     const char *define = xpidl_basename(state->basename);
+    char *define = xpidl_basename(state->basename);
     fprintf(state->file, "\n#endif /* __gen_%s_h__ */\n", define);
+    g_free(define);
     return TRUE;
+}

-              r62265
+              r62449
     if (strcmp(outname, "-")) {
         const char *fopen_mode;
         const char *out_basename;
+        char *out_basename;
         /* explicit_output_filename can't be true without a filename */
 …
 #endif
             real_outname = g_strdup_printf("%s.%s", out_basename, mode->suffix);
+            if (out_basename != outname)
+                g_free(out_basename);
+        }

-              r29724
+              r62449
             "\n"
             , ext - basename >= 19 ? 19 : (int)(ext - basename), basename);
+    g_free(basename);
 #else
     fputs("/*\n * ************* DO NOT EDIT THIS FILE ***********\n",
 …
             java_prolog(state);
+        }
+        g_free(basename);
+    }

-              r40504
+              r62449
  * Return a pointer to the start of the base filename of path
  */
 const char *
+char *
 xpidl_basename(const char * path)
+{
     const char * result = g_basename(path);
+    char * result = g_path_get_basename(path);
     /*
      *If this is windows then we'll handle either / or \ as a separator
 …
      */
 #if defined(XP_WIN32)
+# error adapt regarding g_basename() vs. g_path_get_basename()!
     const char * slash = strrchr(path, '/');
     /* If we found a slash and its after the current default OS separator */

Note: See TracChangeset for help on using the changeset viewer.