Pārlūkot izejas kodu

libgis: G__write_timestamp() -> G_write_timestamp()
update modules
(merge https://trac.osgeo.org/grass/changeset/63839, https://trac.osgeo.org/grass/changeset/63841 from trunk)


git-svn-id: https://svn.osgeo.org/grass/grass/branches/releasebranch_7_0@63842 15284696-431f-4ddb-bdfa-cd5b030d7da7

Martin Landa 10 gadi atpakaļ
vecāks
revīzija
eb0de8199c

+ 1 - 1
include/defs/gis.h

@@ -670,7 +670,7 @@ void G_set_timestamp(struct TimeStamp *, const struct DateTime *);
 void G_set_timestamp_range(struct TimeStamp *, const struct DateTime *,
 			   const struct DateTime *);
 int G__read_timestamp(FILE *, struct TimeStamp *);
-int G__write_timestamp(FILE *, const struct TimeStamp *);
+int G_write_timestamp(FILE *, const struct TimeStamp *);
 void G_get_timestamps(const struct TimeStamp *, struct DateTime *, struct DateTime *, int *);
 int G_format_timestamp(const struct TimeStamp *, char *);
 int G_scan_timestamp(struct TimeStamp *, const char *);

+ 3 - 3
lib/gis/timestamp.c

@@ -155,7 +155,7 @@ int G__read_timestamp(FILE * fd, struct TimeStamp *ts)
   \return 0 on success
   \return -1 on error
 */
-int G__write_timestamp(FILE * fd, const struct TimeStamp *ts)
+int G_write_timestamp(FILE * fd, const struct TimeStamp *ts)
 {
     char buf[1024];
 
@@ -294,7 +294,7 @@ static int write_timestamp(const char *maptype, const char *dir,
 	return -1;
     }
 
-    stat = G__write_timestamp(fd, ts);
+    stat = G_write_timestamp(fd, ts);
     fclose(fd);
     if (stat == 0)
 	return 1;
@@ -526,7 +526,7 @@ int G_write_vector_timestamp(const char *name, const char *layer, const struct T
 	return -1;
     }
 
-    stat = G__write_timestamp(fd, ts);
+    stat = G_write_timestamp(fd, ts);
     fclose(fd);
     if (stat == 0)
 	return 1;

+ 1 - 1
raster/r.timestamp/main.c

@@ -68,7 +68,7 @@ int main(int argc, char *argv[])
 
     if (!modify) {
 	if (G_read_raster_timestamp(name, "", &ts) == 1) {
-	    G__write_timestamp(stdout, &ts);
+	    G_write_timestamp(stdout, &ts);
 	    exit(EXIT_SUCCESS);
 	}
 	else

+ 1 - 1
raster3d/r3.timestamp/r3.timestamp.main.c

@@ -73,7 +73,7 @@ int main(int argc, char *argv[])
 
     if (!modify) {
 	if (G_read_raster3d_timestamp(name, mapset, &ts) == 1) {
-	    G__write_timestamp(stdout, &ts);
+	    G_write_timestamp(stdout, &ts);
 	    exit(EXIT_SUCCESS);
 	}
 	else

+ 1 - 1
vector/v.timestamp/main.c

@@ -69,7 +69,7 @@ int main(int argc, char *argv[])
 
     if (!modify) {
 	if (G_read_vector_timestamp(name, layer->answer, "", &ts) == 1) {
-	    G__write_timestamp(stdout, &ts);
+	    G_write_timestamp(stdout, &ts);
 	    exit(EXIT_SUCCESS);
 	}
 	else