[GRASS-SVN] r63853 - in grass/trunk/general: g.list g.mkfontcap g.remove

svn_grass at osgeo.org svn_grass at osgeo.org
Mon Dec 29 11:26:46 PST 2014


Author: martinl
Date: 2014-12-29 11:26:46 -0800 (Mon, 29 Dec 2014)
New Revision: 63853

Modified:
   grass/trunk/general/g.list/main.c
   grass/trunk/general/g.mkfontcap/stroke_fonts.c
   grass/trunk/general/g.remove/main.c
Log:
update modules to r63851


Modified: grass/trunk/general/g.list/main.c
===================================================================
--- grass/trunk/general/g.list/main.c	2014-12-29 19:26:22 UTC (rev 63852)
+++ grass/trunk/general/g.list/main.c	2014-12-29 19:26:46 UTC (rev 63853)
@@ -404,7 +404,7 @@
     if (access(path, 0) != 0)
 	return;
 
-    if ((list = G__ls(path, &count)) == NULL)
+    if ((list = G_ls2(path, &count)) == NULL)
 	return;
 
     if (strcmp(alias, "raster") == 0)

Modified: grass/trunk/general/g.mkfontcap/stroke_fonts.c
===================================================================
--- grass/trunk/general/g.mkfontcap/stroke_fonts.c	2014-12-29 19:26:22 UTC (rev 63852)
+++ grass/trunk/general/g.mkfontcap/stroke_fonts.c	2014-12-29 19:26:46 UTC (rev 63853)
@@ -56,7 +56,7 @@
 
     G_asprintf(&dirpath, "%s/fonts", G_gisbase());
 
-    dirlisting = G__ls(dirpath, &numfiles);
+    dirlisting = G_ls2(dirpath, &numfiles);
 
     G_asprintf(&fonttable, "%s/fonts.table", dirpath);
     if (access(fonttable, R_OK) == 0)

Modified: grass/trunk/general/g.remove/main.c
===================================================================
--- grass/trunk/general/g.remove/main.c	2014-12-29 19:26:22 UTC (rev 63852)
+++ grass/trunk/general/g.remove/main.c	2014-12-29 19:26:46 UTC (rev 63853)
@@ -236,7 +236,7 @@
 	    continue;
 
 	rast = !G_strcasecmp(elem->alias, "raster");
-	files = G__ls(path, &num_files);
+	files = G_ls2(path, &num_files);
 
 	for (j = 0; j < num_files; j++) {
 	    if (!flag.force->answer) {



More information about the grass-commit mailing list