Rename wmem_permanent_scope -> wmem_epan_scope to reflect the fact that it

is technically scoped to the library, not the process. It's also shorter :)

svn path=/trunk/; revision=45877

epan/prefs.c

@@ -431,7 +431,7 @@ prefs_register_protocol_subtree(const char *subtree, int id, void (*apply_cb)(vo
                  * being the name (if it's later registered explicitly
                  * with a description, that will override it).
                  */
-                ptr = wmem_strdup(wmem_permanent_scope(), ptr),
+                ptr = wmem_strdup(wmem_epan_scope(), ptr),
                 new_module = prefs_register_subtree(subtree_module, ptr, ptr, NULL);
             }
 
@@ -2608,7 +2608,7 @@ pre_init_prefs(void)
   prefs.gui_fileopen_style         = FO_STYLE_LAST_OPENED;
   prefs.gui_recent_df_entries_max  = 10;
   prefs.gui_recent_files_count_max = 10;
-  prefs.gui_fileopen_dir           = wmem_strdup(wmem_permanent_scope(), get_persdatafile_dir());
+  prefs.gui_fileopen_dir           = wmem_strdup(wmem_epan_scope(), get_persdatafile_dir());
   prefs.gui_fileopen_preview       = 3;
   prefs.gui_ask_unsaved            = TRUE;
   prefs.gui_find_wrap              = TRUE;

epan/wmem/wmem_core.c

@@ -29,7 +29,7 @@
 #include "wmem_allocator.h"
 #include "wmem_allocator_glib.h"
 
-static wmem_allocator_t *permanent_scope;
+static wmem_allocator_t *epan_scope;
 
 void *
 wmem_alloc(wmem_allocator_t *allocator, size_t size)
@@ -61,21 +61,21 @@ wmem_destroy_allocator(wmem_allocator_t *allocator)
 }
 
 wmem_allocator_t *
-wmem_permanent_scope(void)
+wmem_epan_scope(void)
 {
-    return permanent_scope;
+    return epan_scope;
 }
 
 void
 wmem_init(void)
 {
-    permanent_scope = wmem_create_glib_allocator();
+    epan_scope = wmem_create_glib_allocator();
 }
 
 void
 wmem_cleanup(void)
 {
-    wmem_destroy_allocator(permanent_scope);
+    wmem_destroy_allocator(epan_scope);
 }
 
 /*

epan/wmem/wmem_core.h

@@ -49,7 +49,7 @@ void
 wmem_destroy_allocator(wmem_allocator_t *allocator);
 
 wmem_allocator_t *
-wmem_permanent_scope(void);
+wmem_epan_scope(void);
 
 void
 wmem_init(void);