瀏覽代碼

GNAME_MAX (trac https://trac.osgeo.org/grass/ticket/416), itc->osgeo (merge from devbr6)

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@35757 15284696-431f-4ddb-bdfa-cd5b030d7da7
Hamish Bowman 16 年之前
父節點
當前提交
471b37d4ec

+ 3 - 3
raster/r.le/r.le.patch/driver.c

@@ -139,7 +139,7 @@ void patch_fore()
 void open_files()
 {
     FILE *fp;
-    char path[30];
+    char path[GPATH_MAX];
     int i;
 
     if (choice->att[1] || choice->att[2] || choice->att[3] || choice->att[4]) {
@@ -2465,7 +2465,7 @@ void read_para(char *name, int line, float *value, int *count)
 {
     FILE *fp;
     int i = 0, cnt = 1;
-    char *buf, path[30];
+    char *buf, path[GPATH_MAX];
 
     /* VARIABLES
        Incoming
@@ -2542,7 +2542,7 @@ void read_line(char *name, int line, int n, int *value, int *fvalue,
 {
     FILE *fp;
     int i;
-    char path[30], *buf;
+    char path[GPATH_MAX], *buf;
 
     sprintf(path, "r.le.para/%s", name);
 

+ 1 - 1
raster/r.le/r.le.patch/patch.c

@@ -42,7 +42,7 @@ void df_patch(PATCH * patch_list)
 {
     PATCH *tmp = patch_list;
     int *type_dens, type_coh;
-    char path[30];
+    char path[GNAME_MAX+10];
 
     if (!total_patches)
 	return;

+ 1 - 1
raster/r.le/r.le.patch/patch.h

@@ -78,7 +78,7 @@ typedef struct patch
 
 struct CHOICE
 {
-    char fn[30], reg[30], out[30], wrum;
+    char fn[GNAME_MAX], reg[GMAPSET_MAX], out[GNAME_MAX], wrum;
     int core2, size2, shape2, edge, fb, coremap, units;
     int perim2, trace, patchmap;
     int Mx[4];

+ 1 - 1
raster/r.le/r.le.patch/r.le.patch.html

@@ -18,7 +18,7 @@ Baker, W.L. and Y. Cai. 1992. The r.le programs for multiscale analysis of
 landscape structure using the GRASS geographical information system.
 Landscape Ecology 7(4):291-302.
 <p>
-The <A href="http://grass.itc.it/gdp/landscape/r_le_manual5.pdf"><i>r.le</i>
+The <A href="http://grass.osgeo.org/gdp/landscape/r_le_manual5.pdf"><i>r.le</i>
 manual: Quantitative analysis of landscape structures</a> (GRASS 5; 2001)
 
 <h2>SEE ALSO</h2>

+ 1 - 1
raster/r.le/r.le.pixel/r.le.pixel.html

@@ -17,7 +17,7 @@ Baker, W.L. and Y. Cai. 1992. The r.le programs for multiscale analysis of
 landscape structure using the GRASS geographical information system.
 Landscape Ecology 7(4):291-302.
 <p>
-The <A href="http://grass.itc.it/gdp/landscape/r_le_manual5.pdf"><i>r.le</i>
+The <A href="http://grass.osgeo.org/gdp/landscape/r_le_manual5.pdf"><i>r.le</i>
 manual: Quantitative analysis of landscape structures</a> (GRASS 5; 2001)
 
 <h2>SEE ALSO</h2>

+ 1 - 1
raster/r.le/r.le.setup/r.le.setup.html

@@ -449,7 +449,7 @@ Baker, W.L. and Y. Cai. 1992. The r.le programs for multiscale analysis of
 landscape structure using the GRASS geographical information system.
 Landscape Ecology 7(4):291-302.
 <p>
-The <A href="http://grass.itc.it/gdp/landscape/r_le_manual5.pdf"><i>r.le</i>
+The <A href="http://grass.osgeo.org/gdp/landscape/r_le_manual5.pdf"><i>r.le</i>
 manual: Quantitative analysis of landscape structures</a> (GRASS 5; 2001)
 
 

+ 1 - 1
raster/r.le/r.le.trace/r.le.trace.html

@@ -19,7 +19,7 @@ Baker, W.L. and Y. Cai. 1992. The r.le programs for multiscale analysis of
 landscape structure using the GRASS geographical information system.
 Landscape Ecology 7(4):291-302.
 <p>
-The <A href="http://grass.itc.it/gdp/landscape/r_le_manual5.pdf"><i>r.le</i>
+The <A href="http://grass.osgeo.org/gdp/landscape/r_le_manual5.pdf"><i>r.le</i>
 manual: Quantitative analysis of landscape structures</a> (GRASS 5; 2001)