Rename some methods defined in clean-temp.c.

diff --git a/gettext-tools/lib/ChangeLog b/gettext-tools/lib/ChangeLog
index 9264c1549fc98aed4fa75afc005e5bcd090b8f9c..c7dc88fe20cee6dfd80d004b3c86f8ac5041ac59 100644 (file)
--- a/gettext-tools/lib/ChangeLog
+++ b/gettext-tools/lib/ChangeLog
@@ -1,3 +1,19 @@
+2006-07-02  Bruno Haible  <bruno@clisp.org>
+
+       * clean-temp.h (register_temp_file): Renamed from enqueue_temp_file.
+       (unregister_temp_file): Renamed from dequeue_temp_file.
+       (register_temp_subdir): Renamed from enqueue_temp_subdir.
+       (unregister_temp_subdir): Renamed from dequeue_temp_subdir.
+       * clean-temp.c (register_temp_file): Renamed from enqueue_temp_file.
+       (unregister_temp_file): Renamed from dequeue_temp_file.
+       (register_temp_subdir): Renamed from enqueue_temp_subdir.
+       (unregister_temp_subdir): Renamed from dequeue_temp_subdir.
+       (cleanup_temp_file, cleanup_temp_subdir): Update.
+       * javacomp.c (write_temp_file, is_envjavac_gcj_14_14_usable,
+       is_envjavac_gcj_14_13_usable, is_envjavac_nongcj_usable,
+       is_gcj_present, is_gcj_14_14_usable, is_gcj_14_13_usable,
+       is_javac_usable): Update.
+
 2006-06-29  Bruno Haible  <bruno@clisp.org>
 
        * clean-temp.h: Include <stdbool.h>.

diff --git a/gettext-tools/lib/clean-temp.c b/gettext-tools/lib/clean-temp.c
index 557e8f865fcf148477ef3dc13208787587f6faa6..9ae06c37aa088d90a9ebc7b163b9215b2be9f32b 100644 (file)
--- a/gettext-tools/lib/clean-temp.c
+++ b/gettext-tools/lib/clean-temp.c
@@ -236,13 +236,14 @@ create_temp_dir (const char *prefix, const char *parentdir,
    needs to be removed before DIR can be removed.
    Should be called before the file ABSOLUTE_FILE_NAME is created.  */
 void
-enqueue_temp_file (struct temp_dir *dir,
-                  const char *absolute_file_name)
+register_temp_file (struct temp_dir *dir,
+                   const char *absolute_file_name)
 {
   struct tempdir *tmpdir = (struct tempdir *)dir;
   size_t j;
 
-  /* See whether it can take the slot of an earlier file already dequeued.  */
+  /* See whether it can take the slot of an earlier file already
+     unregistered.  */
   for (j = 0; j < tmpdir->file_count; j++)
     if (tmpdir->file[j] == NULL)
       {
@@ -285,8 +286,8 @@ enqueue_temp_file (struct temp_dir *dir,
    needs to be removed before DIR can be removed.
    Should be called when the file ABSOLUTE_FILE_NAME could not be created.  */
 void
-dequeue_temp_file (struct temp_dir *dir,
-                  const char *absolute_file_name)
+unregister_temp_file (struct temp_dir *dir,
+                     const char *absolute_file_name)
 {
   struct tempdir *tmpdir = (struct tempdir *)dir;
   size_t j;
@@ -314,12 +315,12 @@ dequeue_temp_file (struct temp_dir *dir,
    that needs to be removed before DIR can be removed.
    Should be called before the subdirectory ABSOLUTE_DIR_NAME is created.  */
 void
-enqueue_temp_subdir (struct temp_dir *dir,
-                    const char *absolute_dir_name)
+register_temp_subdir (struct temp_dir *dir,
+                     const char *absolute_dir_name)
 {
   struct tempdir *tmpdir = (struct tempdir *)dir;
 
-  /* Reusing the slot of an earlier subdirectory already dequeued is not
+  /* Reusing the slot of an earlier subdirectory already unregistered is not
      possible here, because the order of the subdirectories matter.  */
   /* See whether the array needs to be extended.  */
   if (tmpdir->subdir_count == tmpdir->subdir_allocated)
@@ -358,8 +359,8 @@ enqueue_temp_subdir (struct temp_dir *dir,
    Should be called when the subdirectory ABSOLUTE_DIR_NAME could not be
    created.  */
 void
-dequeue_temp_subdir (struct temp_dir *dir,
-                    const char *absolute_dir_name)
+unregister_temp_subdir (struct temp_dir *dir,
+                       const char *absolute_dir_name)
 {
   struct tempdir *tmpdir = (struct tempdir *)dir;
   size_t j;
@@ -413,7 +414,7 @@ cleanup_temp_file (struct temp_dir *dir,
                   const char *absolute_file_name)
 {
   do_unlink (dir, absolute_file_name);
-  dequeue_temp_file (dir, absolute_file_name);
+  unregister_temp_file (dir, absolute_file_name);
 }
 
 /* Remove the given ABSOLUTE_DIR_NAME and unregister it.  */
@@ -422,7 +423,7 @@ cleanup_temp_subdir (struct temp_dir *dir,
                     const char *absolute_dir_name)
 {
   do_rmdir (dir, absolute_dir_name);
-  dequeue_temp_subdir (dir, absolute_dir_name);
+  unregister_temp_subdir (dir, absolute_dir_name);
 }
 
 /* Remove all registered files and subdirectories inside DIR.  */

diff --git a/gettext-tools/lib/clean-temp.h b/gettext-tools/lib/clean-temp.h
index e511c9c112a034502f1929337e90854aa3124b39..c564addacc86587a8280a8866be8619e19c756e5 100644 (file)
--- a/gettext-tools/lib/clean-temp.h
+++ b/gettext-tools/lib/clean-temp.h
@@ -61,27 +61,27 @@ extern struct temp_dir * create_temp_dir (const char *prefix,
 /* Register the given ABSOLUTE_FILE_NAME as being a file inside DIR, that
    needs to be removed before DIR can be removed.
    Should be called before the file ABSOLUTE_FILE_NAME is created.  */
-extern void enqueue_temp_file (struct temp_dir *dir,
-                              const char *absolute_file_name);
+extern void register_temp_file (struct temp_dir *dir,
+                               const char *absolute_file_name);
 
 /* Unregister the given ABSOLUTE_FILE_NAME as being a file inside DIR, that
    needs to be removed before DIR can be removed.
    Should be called when the file ABSOLUTE_FILE_NAME could not be created.  */
-extern void dequeue_temp_file (struct temp_dir *dir,
-                              const char *absolute_file_name);
+extern void unregister_temp_file (struct temp_dir *dir,
+                                 const char *absolute_file_name);
 
 /* Register the given ABSOLUTE_DIR_NAME as being a subdirectory inside DIR,
    that needs to be removed before DIR can be removed.
    Should be called before the subdirectory ABSOLUTE_DIR_NAME is created.  */
-extern void enqueue_temp_subdir (struct temp_dir *dir,
-                                const char *absolute_dir_name);
+extern void register_temp_subdir (struct temp_dir *dir,
+                                 const char *absolute_dir_name);
 
 /* Unregister the given ABSOLUTE_DIR_NAME as being a subdirectory inside DIR,
    that needs to be removed before DIR can be removed.
    Should be called when the subdirectory ABSOLUTE_DIR_NAME could not be
    created.  */
-extern void dequeue_temp_subdir (struct temp_dir *dir,
-                                const char *absolute_dir_name);
+extern void unregister_temp_subdir (struct temp_dir *dir,
+                                   const char *absolute_dir_name);
 
 /* Remove the given ABSOLUTE_FILE_NAME and unregister it.  */
 extern void cleanup_temp_file (struct temp_dir *dir,

diff --git a/gettext-tools/lib/javacomp.c b/gettext-tools/lib/javacomp.c
index ee19b8951a1ef95735b8e51cb7aa3b60a11c8083..06e649059f8282a26f49abc52486c4a5f7e4cad3 100644 (file)
--- a/gettext-tools/lib/javacomp.c
+++ b/gettext-tools/lib/javacomp.c
@@ -468,12 +468,12 @@ write_temp_file (struct temp_dir *tmpdir, const char *file_name,
 {
   FILE *fp;
 
-  enqueue_temp_file (tmpdir, file_name);
+  register_temp_file (tmpdir, file_name);
   fp = fopen (file_name, "w");
   if (fp == NULL)
     {
       error (0, errno, _("failed to create \"%s\""), file_name);
-      dequeue_temp_file (tmpdir, file_name);
+      unregister_temp_file (tmpdir, file_name);
       return true;
     }
   fputs (contents, fp);
@@ -622,7 +622,7 @@ is_envjavac_gcj_14_14_usable (const char *javac, bool *usablep)
 
       compiled_file_name =
        concatenated_pathname (tmpdir->dir_name, "conftest.class", NULL);
-      enqueue_temp_file (tmpdir, compiled_file_name);
+      register_temp_file (tmpdir, compiled_file_name);
 
       java_sources[0] = conftest_file_name;
       if (!compile_using_envjavac (javac, java_sources, 1, tmpdir->dir_name,
@@ -683,7 +683,7 @@ is_envjavac_gcj_14_13_usable (const char *javac,
 
       compiled_file_name =
        concatenated_pathname (tmpdir->dir_name, "conftest.class", NULL);
-      enqueue_temp_file (tmpdir, compiled_file_name);
+      register_temp_file (tmpdir, compiled_file_name);
 
       java_sources[0] = conftest_file_name;
       if (!compile_using_envjavac (javac,
@@ -729,7 +729,7 @@ is_envjavac_gcj_14_13_usable (const char *javac,
          compiled_file_name =
            concatenated_pathname (tmpdir->dir_name, "conftestfail.class",
                                   NULL);
-         enqueue_temp_file (tmpdir, compiled_file_name);
+         register_temp_file (tmpdir, compiled_file_name);
 
          java_sources[0] = conftest_file_name;
          if (!compile_using_envjavac (javac,
@@ -823,7 +823,7 @@ is_envjavac_nongcj_usable (const char *javac,
 
       compiled_file_name =
        concatenated_pathname (tmpdir->dir_name, "conftest.class", NULL);
-      enqueue_temp_file (tmpdir, compiled_file_name);
+      register_temp_file (tmpdir, compiled_file_name);
 
       java_sources[0] = conftest_file_name;
       if (!compile_using_envjavac (javac,
@@ -871,7 +871,7 @@ is_envjavac_nongcj_usable (const char *javac,
                    concatenated_pathname (tmpdir->dir_name,
                                           "conftestfail.class",
                                           NULL);
-                 enqueue_temp_file (tmpdir, compiled_file_name);
+                 register_temp_file (tmpdir, compiled_file_name);
 
                  java_sources[0] = conftest_file_name;
                  if (!compile_using_envjavac (javac,
@@ -957,7 +957,7 @@ is_envjavac_nongcj_usable (const char *javac,
                        concatenated_pathname (tmpdir->dir_name,
                                               "conftestfail.class",
                                               NULL);
-                     enqueue_temp_file (tmpdir, compiled_file_name);
+                     register_temp_file (tmpdir, compiled_file_name);
 
                      java_sources[0] = conftest_file_name;
                      if (!compile_using_envjavac (javac_target,
@@ -1125,7 +1125,7 @@ is_gcj_present (void)
                    concatenated_pathname (tmpdir->dir_name,
                                           "conftestlib.class",
                                           NULL);
-                 enqueue_temp_file (tmpdir, compiled_file_name);
+                 register_temp_file (tmpdir, compiled_file_name);
 
                  java_sources[0] = conftest_file_name;
                  if (compile_using_gcj (java_sources, 1, false,
@@ -1180,7 +1180,7 @@ is_gcj_14_14_usable (bool *usablep)
 
       compiled_file_name =
        concatenated_pathname (tmpdir->dir_name, "conftest.class", NULL);
-      enqueue_temp_file (tmpdir, compiled_file_name);
+      register_temp_file (tmpdir, compiled_file_name);
 
       java_sources[0] = conftest_file_name;
       if (!compile_using_gcj (java_sources, 1, false, tmpdir->dir_name,
@@ -1237,7 +1237,7 @@ is_gcj_14_13_usable (bool *usablep, bool *need_no_assert_option_p)
 
       compiled_file_name =
        concatenated_pathname (tmpdir->dir_name, "conftest.class", NULL);
-      enqueue_temp_file (tmpdir, compiled_file_name);
+      register_temp_file (tmpdir, compiled_file_name);
 
       java_sources[0] = conftest_file_name;
       if (!compile_using_gcj (java_sources, 1, true, tmpdir->dir_name,
@@ -1344,7 +1344,7 @@ is_javac_usable (const char *source_version, const char *target_version,
 
       compiled_file_name =
        concatenated_pathname (tmpdir->dir_name, "conftest.class", NULL);
-      enqueue_temp_file (tmpdir, compiled_file_name);
+      register_temp_file (tmpdir, compiled_file_name);
 
       java_sources[0] = conftest_file_name;
       if (!compile_using_javac (java_sources, 1,
@@ -1390,7 +1390,7 @@ is_javac_usable (const char *source_version, const char *target_version,
                    concatenated_pathname (tmpdir->dir_name,
                                           "conftestfail.class",
                                           NULL);
-                 enqueue_temp_file (tmpdir, compiled_file_name);
+                 register_temp_file (tmpdir, compiled_file_name);
 
                  java_sources[0] = conftest_file_name;
                  if (!compile_using_javac (java_sources, 1,
@@ -1472,7 +1472,7 @@ is_javac_usable (const char *source_version, const char *target_version,
                        concatenated_pathname (tmpdir->dir_name,
                                               "conftestfail.class",
                                               NULL);
-                     enqueue_temp_file (tmpdir, compiled_file_name);
+                     register_temp_file (tmpdir, compiled_file_name);
 
                      java_sources[0] = conftest_file_name;
                      if (!compile_using_javac (java_sources, 1,

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index 495f823b8c19279de42b0a415bd2ce1417b5ab2a..23220da36324f8682e8746fd49fe64aafb9eae51 100644 (file)
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-02  Bruno Haible  <bruno@clisp.org>
+
+       * write-csharp.c (msgdomain_write_csharp): Update.
+       * write-java.c (msgdomain_write_java): Update.
+
 2006-06-29  Bruno Haible  <bruno@clisp.org>
 
        * write-csharp.c (msgdomain_write_csharp): Update.

diff --git a/gettext-tools/src/write-csharp.c b/gettext-tools/src/write-csharp.c
index b2cf6bbd323de757ed32a4cb85763b6d1d1a7af1..40da40581d184436dab8d3870ef94e452565a8ba 100644 (file)
--- a/gettext-tools/src/write-csharp.c
+++ b/gettext-tools/src/write-csharp.c
@@ -714,12 +714,12 @@ but the C# .dll format doesn't support contexts\n")));
     concatenated_pathname (tmpdir->dir_name, "resset.cs", NULL);
 
   /* Create the C# file.  */
-  enqueue_temp_file (tmpdir, csharp_file_name);
+  register_temp_file (tmpdir, csharp_file_name);
   csharp_file = fopen (csharp_file_name, "w");
   if (csharp_file == NULL)
     {
       error (0, errno, _("failed to create \"%s\""), csharp_file_name);
-      dequeue_temp_file (tmpdir, csharp_file_name);
+      unregister_temp_file (tmpdir, csharp_file_name);
       goto quit3;
     }
 

diff --git a/gettext-tools/src/write-java.c b/gettext-tools/src/write-java.c
index 8b88ef40be53e063ad3ba740edb1000fefc78dd5..af0b3e43757cd7cb6711a9cd119ea7a196af11af 100644 (file)
--- a/gettext-tools/src/write-java.c
+++ b/gettext-tools/src/write-java.c
@@ -990,23 +990,23 @@ but the Java ResourceBundle format doesn't support contexts\n")));
 
     for (i = 0; i < ndots; i++)
       {
-       enqueue_temp_subdir (tmpdir, subdirs[i]);
+       register_temp_subdir (tmpdir, subdirs[i]);
        if (mkdir (subdirs[i], S_IRUSR | S_IWUSR | S_IXUSR) < 0)
          {
            error (0, errno, _("failed to create \"%s\""), subdirs[i]);
-           dequeue_temp_subdir (tmpdir, subdirs[i]);
+           unregister_temp_subdir (tmpdir, subdirs[i]);
            goto quit3;
          }
       }
   }
 
   /* Create the Java file.  */
-  enqueue_temp_file (tmpdir, java_file_name);
+  register_temp_file (tmpdir, java_file_name);
   java_file = fopen (java_file_name, "w");
   if (java_file == NULL)
     {
       error (0, errno, _("failed to create \"%s\""), java_file_name);
-      dequeue_temp_file (tmpdir, java_file_name);
+      unregister_temp_file (tmpdir, java_file_name);
       goto quit3;
     }