Add, use "struct Counter" and supporting functions

Add G_init_all()


git-svn-id: https://svn.osgeo.org/grass/grass/trunk@34485 15284696-431f-4ddb-bdfa-cd5b030d7da7

include/gis.h

@@ -636,6 +636,10 @@ struct TimeStamp
 
 struct GDAL_link;
 
+struct Counter {
+    int value;
+};
+
 /*============================== Prototypes ================================*/
 
 /* Since there are so many prototypes for the gis library they are stored */

include/gisdefs.h

@@ -387,6 +387,10 @@ int G_recursive_copy(const char *, const char *);
 /* copy_file.c */
 int G_copy_file(const char *, const char *);
 
+/* counter.c */
+void G_init_counter(struct Counter *, int);
+int G_counter_next(struct Counter *);
+
 /* dalloc.c */
 double *G_alloc_vector(size_t);
 double **G_alloc_matrix(int, int);
@@ -609,6 +613,7 @@ char *G_gisdbase(void);
 void G__gisinit(const char *, const char *);
 void G__no_gisinit(const char *);
 void G__check_gisinit(void);
+void G_init_all(void);
 
 /* histo_eq.c */
 void G_histogram_eq(const struct Histogram *, unsigned char **,
@@ -1100,6 +1105,7 @@ int G_svelim(double *, int);
 int G_system(const char *);
 
 /* tempfile.c */
+void G_init_tempfile(void);
 char *G_tempfile(void);
 char *G__tempfile(int);
 void G__temp_element(char *);

lib/gis/counter.c

@@ -0,0 +1,12 @@
+#include <grass/gis.h>
+
+void G_init_counter(struct Counter *c, int v)
+{
+    c->value = v;
+}
+
+int G_counter_next(struct Counter *c)
+{
+    return c->value++;
+}
+

lib/gis/error.c

@@ -46,11 +46,10 @@ static int (*ext_error) (const char *, int);	/* Roger Bivand 17 June 2000 */
 static int no_warn = 0;
 static int no_sleep = 1;
 
-static int grass_info_format = -1;
+static int grass_info_format;
 static char *logfile;
 static char *prefix_std[3];
-
-static int message_id = 1;
+static struct Counter message_id;
 
 static int print_word(FILE *, char **, int *, const int);
 static void print_sentence(FILE *, const int, const char *);
@@ -312,6 +311,8 @@ void G_init_logging(void)
     if (initialized)
 	return;
 
+    G_init_counter(&message_id, 1);
+
     prefix_std[0] = "";
     prefix_std[1] = _("WARNING: ");
     prefix_std[2] = _("ERROR: ");
@@ -446,16 +447,17 @@ static void print_sentence(FILE * fd, const int type, const char *msg)
 {
     char prefix[100];
     const char *start;
+    int id = G_counter_next(&message_id);
 
     switch (type) {
     case MSG:
-	sprintf(prefix, "GRASS_INFO_MESSAGE(%d,%d): ", getpid(), message_id);
+	sprintf(prefix, "GRASS_INFO_MESSAGE(%d,%d): ", getpid(), id);
 	break;
     case WARN:
-	sprintf(prefix, "GRASS_INFO_WARNING(%d,%d): ", getpid(), message_id);
+	sprintf(prefix, "GRASS_INFO_WARNING(%d,%d): ", getpid(), id);
 	break;
     case ERR:
-	sprintf(prefix, "GRASS_INFO_ERROR(%d,%d): ", getpid(), message_id);
+	sprintf(prefix, "GRASS_INFO_ERROR(%d,%d): ", getpid(), id);
 	break;
     }
 
@@ -480,8 +482,7 @@ static void print_sentence(FILE * fd, const int type, const char *msg)
 	fprintf(fd, "\n");
 	start = next;
     }
-    fprintf(stderr, "GRASS_INFO_END(%d,%d)\n", getpid(), message_id);
-    message_id++;
+    fprintf(stderr, "GRASS_INFO_END(%d,%d)\n", getpid(), id);
 }
 
 /*!

lib/gis/gisinit.c

@@ -129,3 +129,26 @@ static int gisinit(void)
 
     return 0;
 }
+
+void G_init_all(void)
+{
+    G__check_gisinit();
+    G_init_env();
+    G_init_logging();
+    G__init_window();
+    G_get_fp_type();
+    G_get_compression_type();
+    G__check_for_auto_masking();
+    G_init_locale();
+    G_init_debug();
+    G_verbose();
+    G_init_tempfile();
+    G_init_gdal();
+    G_get_list_of_mapsets();
+    G__home();
+    G__machine_name();
+    G_whoami();
+    G_read_datum_table();
+    G_read_ellipsoid_table(0);
+}
+

lib/gis/tempfile.c

@@ -19,6 +19,18 @@
 #include <sys/stat.h>
 #include <grass/gis.h>
 
+static struct Counter unique;
+static int initialized;
+
+void G_init_tempfile(void)
+{
+    if (initialized)
+	return;
+
+    G_init_counter(&unique, 0);
+
+    initialized = 1;
+}
 
 /**
  * \brief Returns a temporary file name.
@@ -49,7 +61,6 @@ char *G_tempfile(void)
     return G__tempfile(getpid());
 }
 
-
 /**
  * \brief Create tempfile from process id.
  *
@@ -64,14 +75,15 @@ char *G__tempfile(int pid)
     char path[GPATH_MAX];
     char name[GNAME_MAX];
     char element[100];
-    static int uniq = 0;
     struct stat st;
 
     if (pid <= 0)
 	pid = getpid();
     G__temp_element(element);
+    G_init_tempfile();
     do {
-	sprintf(name, "%d.%d", pid, uniq++);
+	int uniq = G_counter_next(&unique);
+	sprintf(name, "%d.%d", pid, uniq);
 	G__file_name(path, element, name, G_mapset());
     }
     while (stat(path, &st) == 0);