[GRASS-SVN] r63854 - in grass/branches/releasebranch_7_0: . general/g.list general/g.mkfontcap general/g.remove lib/gis lib/imagery
svn_grass at osgeo.org
svn_grass at osgeo.org
Mon Dec 29 11:28:01 PST 2014
Author: martinl
Date: 2014-12-29 11:28:01 -0800 (Mon, 29 Dec 2014)
New Revision: 63854
Modified:
grass/branches/releasebranch_7_0/
grass/branches/releasebranch_7_0/general/g.list/main.c
grass/branches/releasebranch_7_0/general/g.mkfontcap/stroke_fonts.c
grass/branches/releasebranch_7_0/general/g.remove/main.c
grass/branches/releasebranch_7_0/lib/gis/color_rules.c
grass/branches/releasebranch_7_0/lib/gis/list.c
grass/branches/releasebranch_7_0/lib/gis/ls.c
grass/branches/releasebranch_7_0/lib/imagery/list_subgp.c
Log:
libgis: G__ls -> G_ls2
update modules
(merge r63851,r63853 from trunk)
Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
- /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,62190,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750-62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62828,62831,62838,62845,62847,62850,62856,62879,62881,62886,62904,62907-62908,62910,62912,62914,62916,62918,62920,62925,62932-62933,62935,62940,62942,62944-62946,62949,62955-62956,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,
63076,63079,63081,63083,63085,63087,63089,63091,63093,63095,63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63160,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255,63259,63261,63275-63276,63279,63281,63283,63287,63290,63292,63297,63302,63304-63307,63315,63319,63327,63330,63332,63339,63342,63345,63361-63363,63367,63379,63389,63391,63393,63402,63408-63409,63416-63417,63425,63427,63429,63431,63433,63448,63451,63453,63457,63459,63464-63470,63473,63482,63497,63505,63508,63510,63515,63521-63524,63526,63536-63537,63551-63552,63554,63556,63558-63559,63562,63570,63576,63582,63589-63593,63602,63604,63608-63609,63616,63618,63624,63626,63628,63630,63634,63639,63642,63644,63650,63652,63656,63679,63685,63689,63691,63693,63695,63698,63700-63702,63704,63706-63707,63709,63711,63713,63715,63717-63718
,63721-63727,63731,63733,63740-63742,63744,63747-63749,63751-63752,63756,63758,63761,63767,63777,63780,63783,63787,63793,63796-63798,63801,63803,63807-63808,63812,63814,63816,63821,63823-63824,63827-63828,63830-63831,63834-63835,63837-63839,63841,63843-63844,63846-63847,63849
+ /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,62190,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750-62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62828,62831,62838,62845,62847,62850,62856,62879,62881,62886,62904,62907-62908,62910,62912,62914,62916,62918,62920,62925,62932-62933,62935,62940,62942,62944-62946,62949,62955-62956,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,
63076,63079,63081,63083,63085,63087,63089,63091,63093,63095,63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63160,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255,63259,63261,63275-63276,63279,63281,63283,63287,63290,63292,63297,63302,63304-63307,63315,63319,63327,63330,63332,63339,63342,63345,63361-63363,63367,63379,63389,63391,63393,63402,63408-63409,63416-63417,63425,63427,63429,63431,63433,63448,63451,63453,63457,63459,63464-63470,63473,63482,63497,63505,63508,63510,63515,63521-63524,63526,63536-63537,63551-63552,63554,63556,63558-63559,63562,63570,63576,63582,63589-63593,63602,63604,63608-63609,63616,63618,63624,63626,63628,63630,63634,63639,63642,63644,63650,63652,63656,63679,63685,63689,63691,63693,63695,63698,63700-63702,63704,63706-63707,63709,63711,63713,63715,63717-63718
,63721-63727,63731,63733,63740-63742,63744,63747-63749,63751-63752,63756,63758,63761,63767,63777,63780,63783,63787,63793,63796-63798,63801,63803,63807-63808,63812,63814,63816,63821,63823-63824,63827-63828,63830-63831,63834-63835,63837-63839,63841,63843-63844,63846-63847,63849,63851,63853
Modified: grass/branches/releasebranch_7_0/general/g.list/main.c
===================================================================
--- grass/branches/releasebranch_7_0/general/g.list/main.c 2014-12-29 19:26:46 UTC (rev 63853)
+++ grass/branches/releasebranch_7_0/general/g.list/main.c 2014-12-29 19:28:01 UTC (rev 63854)
@@ -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/branches/releasebranch_7_0/general/g.mkfontcap/stroke_fonts.c
===================================================================
--- grass/branches/releasebranch_7_0/general/g.mkfontcap/stroke_fonts.c 2014-12-29 19:26:46 UTC (rev 63853)
+++ grass/branches/releasebranch_7_0/general/g.mkfontcap/stroke_fonts.c 2014-12-29 19:28:01 UTC (rev 63854)
@@ -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/branches/releasebranch_7_0/general/g.remove/main.c
===================================================================
--- grass/branches/releasebranch_7_0/general/g.remove/main.c 2014-12-29 19:26:46 UTC (rev 63853)
+++ grass/branches/releasebranch_7_0/general/g.remove/main.c 2014-12-29 19:28:01 UTC (rev 63854)
@@ -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) {
Modified: grass/branches/releasebranch_7_0/lib/gis/color_rules.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/gis/color_rules.c 2014-12-29 19:26:46 UTC (rev 63853)
+++ grass/branches/releasebranch_7_0/lib/gis/color_rules.c 2014-12-29 19:28:01 UTC (rev 63854)
@@ -112,7 +112,7 @@
G_snprintf(path, GPATH_MAX, "%s/etc/colors", G_gisbase());
- rules = G__ls(path, nrules);
+ rules = G_ls2(path, nrules);
rules = G_realloc(rules, (*nrules + 3) * sizeof (const char *));
Modified: grass/branches/releasebranch_7_0/lib/gis/list.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/gis/list.c 2014-12-29 19:26:46 UTC (rev 63853)
+++ grass/branches/releasebranch_7_0/lib/gis/list.c 2014-12-29 19:28:01 UTC (rev 63854)
@@ -126,7 +126,7 @@
* otherwise the ls must be forced into columnar form.
*/
- list = G__ls(path, &count);
+ list = G_ls2(path, &count);
if (count > 0) {
fprintf(out, _("%s files available in mapset <%s>:\n"), desc, mapset);
Modified: grass/branches/releasebranch_7_0/lib/gis/ls.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/gis/ls.c 2014-12-29 19:26:46 UTC (rev 63853)
+++ grass/branches/releasebranch_7_0/lib/gis/ls.c 2014-12-29 19:28:01 UTC (rev 63854)
@@ -52,10 +52,10 @@
}
/**
- * \brief Sets a function and its complementary data for G__ls filtering.
+ * \brief Sets a function and its complementary data for G_ls2 filtering.
*
- * Defines a filter function and its rule data that allow G__ls to filter out
- * unwanted file names. Call this function before G__ls.
+ * Defines a filter function and its rule data that allow G_ls2 to filter out
+ * unwanted file names. Call this function before G_ls2.
*
* \param func Filter callback function to compare a file name and closure
* pattern (if NULL, no filter will be used).
@@ -92,7 +92,7 @@
* \return Pointer to array of strings containing the listing
**/
-char **G__ls(const char *dir, int *num_files)
+char **G_ls2(const char *dir, int *num_files)
{
struct dirent *dp;
DIR *dfd;
@@ -136,7 +136,7 @@
void G_ls(const char *dir, FILE * stream)
{
int i, n;
- char **dir_listing = G__ls(dir, &n);
+ char **dir_listing = G_ls2(dir, &n);
G_ls_format(dir_listing, n, 0, stream);
Modified: grass/branches/releasebranch_7_0/lib/imagery/list_subgp.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/imagery/list_subgp.c 2014-12-29 19:26:46 UTC (rev 63853)
+++ grass/branches/releasebranch_7_0/lib/imagery/list_subgp.c 2014-12-29 19:28:01 UTC (rev 63854)
@@ -47,7 +47,7 @@
if (!G_lstat(path, &sb) == 0 || !S_ISDIR(sb.st_mode))
return NULL;
- subgs = G__ls(path, subgs_num);
+ subgs = G_ls2(path, subgs_num);
return subgs;
}
More information about the grass-commit
mailing list