Skip to content

Commit fc94e29

Browse files
authoredDec 5, 2024··
CQ: Trim trailing whitespace (#4791)
* style: Trim trailing whitespaces * style: Trim trailing whitespaces in mswindows/osgeo4w/ config scripts * style: Trim trailing whitespaces
1 parent 148d93d commit fc94e29

File tree

16 files changed

+185
-185
lines changed

16 files changed

+185
-185
lines changed
 

‎.cppcheck-suppressions

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ syntaxError:display/displaydrivers.html
2929
# dist.x86_64-pc-linux-gnu
3030
syntaxError:dist.x86_64-pc-linux-gnu/*
3131

32-
# doc
32+
# doc
3333
syntaxError:doc/*
3434

3535
# docker
@@ -51,7 +51,7 @@ negativeIndex:imagery/i.atcorr/computations.cpp:1025
5151
syntaxError:include/Makefile
5252
syntaxError:include/VERSION:1
5353

54-
# text files
54+
# text files
5555
syntaxError:INSTALL.md
5656
syntaxError:install-sh
5757
syntaxError:GPL.TXT
@@ -131,7 +131,7 @@ syntaxError:mswindows/*
131131
invalidFunctionArg:raster/r.sim/simlib/random.c:36
132132
invalidFunctionArg:raster/r.sim/simlib/random.c:57
133133

134-
## Different rules under different ifdef.
134+
## Different rules under different ifdef.
135135
ctuOneDefinitionRuleViolation:raster/r.in.pdal/grassrasterwriter.h:39
136136
syntaxError:raster/rasterintro.html
137137
syntaxError:raster/Makefile:155

‎.github/actions/create-upload-suggestions/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ runs:
225225
env:
226226
FORMATTED_URL: >-
227227
[`formatted-${{ steps.tool-name-safe.outputs.tool-name }}`](${{
228-
steps.upload-changes.outputs.artifact-url }})
228+
steps.upload-changes.outputs.artifact-url }})
229229
- name: Fail action if some files were changed
230230
if: >-
231231
${{ (steps.files_changed.outputs.files_changed == 'true') &&

‎.github/workflows/macos.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ jobs:
104104
--min-success 100 --config .github/workflows/macos_gunittest.cfg
105105
env:
106106
SampleData: "https://grass.osgeo.org/sampledata/north_carolina/\
107-
nc_spm_full_v2alpha2.tar.gz"
107+
nc_spm_full_v2alpha2.tar.gz"
108108
- name: Make HTML test report available
109109
if: ${{ !cancelled() }}
110110
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3

‎lib/fonts/fonts/cyrilc.hmp

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@
1919
2801 2802 2823 2805 2806 2821 2804 2822
2020
2809 2810 2811 2812 2813 2814 2815 2816
2121
2832 2817 2818 2819 2820 2807 2803 2829
22-
2828 2808 2825 2830 2826 2824 2827 2832
22+
2828 2808 2825 2830 2826 2824 2827 2832

‎lib/fonts/fonts/fonts.table

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
#
22
# Descriptive Names for GRASS Stroke Fonts
33
#
4-
# This file maps a descriptive name to each font file, for use in the
4+
# This file maps a descriptive name to each font file, for use in the
55
# description field in the fontcap table (generated by g.mkfontcap).
66
#
77
# Format: Each line contains the filename followed by the vertical bar
88
# character | and then the descriptive name.
99
#
10-
# Note that this file is used purely for the purpose of specifying
10+
# Note that this file is used purely for the purpose of specifying
1111
# descriptive names for the Stroke fonts in this directory.
1212
# $GISBASE/etc/fontcap contains the list of fonts available to the GRASS
13-
# display drivers, and any changes must be reflected there before they are
13+
# display drivers, and any changes must be reflected there before they are
1414
# available for use - g.mkfontcap can do this automatically.
1515
#
1616
cyrilc.hmp|Cyrillic

‎mswindows/GRASS-Installer.nsi.tmpl

+128-128
Large diffs are not rendered by default.

‎mswindows/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ifneq ($(MINGW),)
1111
default: GRASS-Packager.bat GRASS-Installer.nsi parsubdirs
1212
else
1313
default:
14-
endif
14+
endif
1515

1616
GRASS-Packager.bat: GRASS-Packager.bat.tmpl
1717
sed \

‎mswindows/generic.manifest

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
2+
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
33
<assemblyIdentity version="1.0.0.0"
44
processorArchitecture="X86"
55
name="@CMD@"
6-
type="win32"/>
7-
<description>GRASS modules</description>
6+
type="win32"/>
7+
<description>GRASS modules</description>
88
<!-- Identify the application security requirements. -->
99
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
1010
<security>

‎mswindows/osgeo4w/gdal-config

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ if test $# -eq 0; then
2525
usage 1 1>&2
2626
fi
2727

28-
case $1 in
28+
case $1 in
2929
--libs)
3030
echo $CONFIG_LIBS
3131
;;

‎mswindows/osgeo4w/geos-config

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ case $1 in
3232
echo $OSGEO4W_ROOT_MSYS/lib/geos_c.lib
3333
;;
3434
--ldflags)
35-
echo
35+
echo
3636
;;
3737
--includes)
3838
echo $OSGEO4W_ROOT_MSYS/include

‎mswindows/osgeo4w/liblas-config

+17-17
Original file line numberDiff line numberDiff line change
@@ -7,57 +7,57 @@ INCLUDES="-I${prefix}/include "
77
LIBS="-L$libdir -llas -llas_c"
88

99
GDAL_INCLUDE=""
10-
if test -n "$GDAL_INCLUDE" ; then
10+
if test -n "$GDAL_INCLUDE" ; then
1111
INCLUDES="$INCLUDES -I$GDAL_INCLUDE"
1212
fi
1313
GDAL_LIBRARY=""
14-
if test -n "$GDAL_LIBRARY" ; then
14+
if test -n "$GDAL_LIBRARY" ; then
1515
LIBS="$LIBS $GDAL_LIBRARY"
1616
fi
1717

1818
GEOTIFF_INCLUDE=""
19-
if test -n "$GEOTIFF_INCLUDE" ; then
19+
if test -n "$GEOTIFF_INCLUDE" ; then
2020
INCLUDES="$INCLUDES -I$GEOTIFF_INCLUDE"
2121
fi
2222
GEOTIFF_LIBRARY=""
23-
if test -n "$GEOTIFF_LIBRARY" ; then
23+
if test -n "$GEOTIFF_LIBRARY" ; then
2424
LIBS="$LIBS $GEOTIFF_LIBRARY"
2525
fi
2626

2727

2828
ORACLE_INCLUDE=""
29-
if test -n "$ORACLE_INCLUDE" ; then
29+
if test -n "$ORACLE_INCLUDE" ; then
3030
INCLUDES="$INCLUDES -I$ORACLE_INCLUDE"
3131
fi
3232
ORACLE_OCI_LIBRARY=""
33-
if test -n "$ORACLE_OCI_LIBRARY" ; then
33+
if test -n "$ORACLE_OCI_LIBRARY" ; then
3434
LIBS="$LIBS $ORACLE_OCI_LIBRARY "
3535
fi
3636

3737
TIFF_INCLUDE=""
38-
if test -n "$TIFF_INCLUDE" ; then
38+
if test -n "$TIFF_INCLUDE" ; then
3939
INCLUDES="$INCLUDES -I$TIFF_INCLUDE"
4040
fi
4141
TIFF_LIBRARY=""
42-
if test -n "$TIFF_LIBRARY" ; then
42+
if test -n "$TIFF_LIBRARY" ; then
4343
LIBS="$LIBS $TIFF_LIBRARY"
4444
fi
4545

4646
LIBXML2_INCLUDE_DIR=""
47-
if test -n "$LIBXML2_INCLUDE_DIR" ; then
47+
if test -n "$LIBXML2_INCLUDE_DIR" ; then
4848
INCLUDES="$INCLUDES -I$LIBXML2_INCLUDE_DIR"
4949
fi
5050
LIBXML2_LIBRARIES=""
51-
if test -n "$LIBXML2_LIBRARIES" ; then
51+
if test -n "$LIBXML2_LIBRARIES" ; then
5252
LIBS="$LIBS $LIBXML2_LIBRARIES"
5353
fi
5454

5555
LASZIP_INCLUDE_DIR=""
56-
if test -n "$LASZIP_INCLUDE_DIR" ; then
56+
if test -n "$LASZIP_INCLUDE_DIR" ; then
5757
INCLUDES="$INCLUDES -I$LASZIP_INCLUDE_DIR"
5858
fi
5959
LASZIP_LIBRARY=""
60-
if test -n "$LASZIP_LIBRARY" ; then
60+
if test -n "$LASZIP_LIBRARY" ; then
6161
LIBS="$LIBS $LASZIP_LIBRARY"
6262
fi
6363

@@ -80,8 +80,8 @@ if test $# -eq 0; then
8080
usage 1 1>&2
8181
fi
8282

83-
case $1 in
84-
--libs)
83+
case $1 in
84+
--libs)
8585
echo $OSGEO4W_ROOT_MSYS/lib/liblas_c.lib
8686
;;
8787

@@ -94,21 +94,21 @@ case $1 in
9494
;;
9595

9696
--defines)
97-
echo
97+
echo
9898
;;
9999

100100
--includes)
101101
echo ${INCLUDES}
102102
;;
103103

104104
--cflags)
105-
echo
105+
echo
106106
;;
107107

108108
--cxxflags)
109109
echo -pedantic -ansi -Wall -Wpointer-arith -Wcast-align -Wcast-qual -Wfloat-equal -Wredundant-decls -Wno-long-long -std=c++98
110110
;;
111-
111+
112112
*)
113113
usage 1 1>&2
114114
;;

‎mswindows/osgeo4w/mysql_config

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
#!/bin/sh
22
# Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
3-
#
3+
#
44
# This program is free software; you can redistribute it and/or modify
55
# it under the terms of the GNU General Public License as published by
66
# the Free Software Foundation; version 2 of the License.
7-
#
7+
#
88
# This program is distributed in the hope that it will be useful,
99
# but WITHOUT ANY WARRANTY; without even the implied warranty of
1010
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1111
# GNU General Public License for more details.
12-
#
12+
#
1313
# You should have received a copy of the GNU General Public License
1414
# along with this program; if not, write to the Free Software
1515
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
@@ -109,7 +109,7 @@ else
109109
port=3306
110110
fi
111111

112-
# Create options
112+
# Create options
113113
# We intentionally add a space to the beginning and end of lib strings, simplifies replace later
114114
libs=" $ldflags -L$pkglibdir -lmysqlclient -lpthread -lz -lm -ldl "
115115
libs="$libs "
@@ -131,19 +131,19 @@ for remove in DDBUG_OFF DSAFE_MUTEX DFORCE_INIT_OF_VARS \
131131
do
132132
# The first option we might strip will always have a space before it because
133133
# we set -I$pkgincludedir as the first option
134-
cflags=`echo "$cflags"|sed -e "s/ -$remove */ /g"`
135-
cxxflags=`echo "$cxxflags"|sed -e "s/ -$remove */ /g"`
134+
cflags=`echo "$cflags"|sed -e "s/ -$remove */ /g"`
135+
cxxflags=`echo "$cxxflags"|sed -e "s/ -$remove */ /g"`
136136
done
137-
cflags=`echo "$cflags"|sed -e 's/ *\$//'`
138-
cxxflags=`echo "$cxxflags"|sed -e 's/ *\$//'`
137+
cflags=`echo "$cflags"|sed -e 's/ *\$//'`
138+
cxxflags=`echo "$cxxflags"|sed -e 's/ *\$//'`
139139

140140
# Same for --libs(_r)
141141
for remove in lmtmalloc static-libcxa i-static static-intel
142142
do
143143
# We know the strings starts with a space
144-
libs=`echo "$libs"|sed -e "s/ -$remove */ /g"`
145-
libs_r=`echo "$libs_r"|sed -e "s/ -$remove */ /g"`
146-
embedded_libs=`echo "$embedded_libs"|sed -e "s/ -$remove */ /g"`
144+
libs=`echo "$libs"|sed -e "s/ -$remove */ /g"`
145+
libs_r=`echo "$libs_r"|sed -e "s/ -$remove */ /g"`
146+
embedded_libs=`echo "$embedded_libs"|sed -e "s/ -$remove */ /g"`
147147
done
148148

149149
# Strip trailing and ending space if any, and '+' (FIXME why?)

‎mswindows/osgeo4w/postinstall.bat

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ textreplace -std -t "%OSGEO4W_ROOT%\apps\grass\grass@POSTFIX@\etc\fontcap"
55

66
for /F "tokens=* USEBACKQ" %%F IN (`getspecialfolder Documents`) do set DOCUMENTS=%%F
77

8-
if not %OSGEO4W_MENU_LINKS%==0 xxmklink "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@.lnk" "%BATCH%" "--gui" "%DOCUMENTS%" "Launch GRASS GIS @VERSION@" 1 "%ICON%"
9-
if not %OSGEO4W_DESKTOP_LINKS%==0 xxmklink "%OSGEO4W_DESKTOP%\GRASS GIS @VERSION@.lnk" "%BATCH%" "--gui" "%DOCUMENTS%" "Launch GRASS GIS @VERSION@" 1 "%ICON%"
8+
if not %OSGEO4W_MENU_LINKS%==0 xxmklink "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@.lnk" "%BATCH%" "--gui" "%DOCUMENTS%" "Launch GRASS GIS @VERSION@" 1 "%ICON%"
9+
if not %OSGEO4W_DESKTOP_LINKS%==0 xxmklink "%OSGEO4W_DESKTOP%\GRASS GIS @VERSION@.lnk" "%BATCH%" "--gui" "%DOCUMENTS%" "Launch GRASS GIS @VERSION@" 1 "%ICON%"
1010

1111
rem run g.mkfontcap outside a GRASS session during
1212
rem an OSGeo4W installation for updating paths to fonts

‎vector/v.buffer/v.buffer.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ <h3>Corner settings</h3>
6666
<img src="v_buffer_line_c.png">
6767
</center>
6868

69-
With a point vector map as input data, square buffers are created instead
69+
With a point vector map as input data, square buffers are created instead
7070
of round buffers by using the <b>-s</b> flag.
7171

7272
<center>

‎vector/v.class/v.class.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ <h2>NOTES</h2>
4444
this new polyline is then chosen as a new node to create break up one of
4545
the two preceding segments, and so forth.
4646

47-
<p>The problem of the difference in terms of units between the two axes
48-
is solved by rescaling both amplitudes to an interval between 0 and 1.
49-
In the original algorithm, the process is stopped when the difference between
50-
the slopes of the two new segments is no longer significant (alpha = 0.05). As
47+
<p>The problem of the difference in terms of units between the two axes
48+
is solved by rescaling both amplitudes to an interval between 0 and 1.
49+
In the original algorithm, the process is stopped when the difference between
50+
the slopes of the two new segments is no longer significant (alpha = 0.05). As
5151
the slope is the ratio between the frequency and the amplitude of the corresponding
5252
interval, i.e. its density, this effectively tests whether the frequencies
5353
of the two newly proposed classes are different from those obtained by

‎vector/v.surf.bspline/v.surf.bspline.html

+7-7
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ <h2>NOTES</h2>
4040
and north-south spline step length arguments allows the user to
4141
account for some degree of anisotropy in the distribution of
4242
observation points. Short spline step lengths, especially spline step
43-
lengths that are less than the distance between observation points,
43+
lengths that are less than the distance between observation points,
4444
can greatly increase the processing time.
4545

4646
<p>The maximum number of splines for each direction at each
@@ -64,15 +64,15 @@ <h2>NOTES</h2>
6464

6565
<p><em>v.surf.bspline</em> can produce raster (<b>raster_output</b>) OR
6666
vector <b>output</b> but NOT simultaneously. Note that topology is not
67-
built for output point vector layer. If required, the topology can be built
67+
built for output point vector layer. If required, the topology can be built
6868
using <em><a href="v.build.html">v.build</a></em>.
6969

70-
<p>If output is a point vector layer and <b>sparse</b> is not specified,
70+
<p>If output is a point vector layer and <b>sparse</b> is not specified,
7171
the output vector layer will contain points at the
7272
same locations as observation points in the input layer but the values
73-
of the output points will be interpolated values. If a <b>sparse</b>
74-
point vector layer is specified, the output vector layer will contain points
75-
at the same locations as the sparse vector layer points. The values will be
73+
of the output points will be interpolated values. If a <b>sparse</b>
74+
point vector layer is specified, the output vector layer will contain points
75+
at the same locations as the sparse vector layer points. The values will be
7676
those of the interpolated raster surface at those points.
7777

7878
<p>A cross validation "leave-one-out" analysis is available to help to
@@ -146,7 +146,7 @@ <h2>KNOWN ISSUES</h2>
146146
<p>
147147
In order to avoid RAM memory problems, an auxiliary table is needed
148148
for recording some intermediate calculations. This requires
149-
the <i>GROUP BY</i> SQL function is used. This function is not
149+
the <i>GROUP BY</i> SQL function is used. This function is not
150150
supported by the DBF driver. For this reason, vector output
151151
(<b>output</b>) is not permitted with the DBF driver. There are
152152
no problems with the raster map output from the DBF driver.

0 commit comments

Comments
 (0)
Please sign in to comment.