[nco] 08/09: Add patch for various new typos.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Sat Feb 27 18:14:35 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository nco.
commit 2c8fd3f972b4b75744d228a8c53c1c0479ca107d
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sat Feb 27 18:52:30 2016 +0100
Add patch for various new typos.
---
debian/changelog | 1 +
debian/patches/series | 1 +
debian/patches/typos.patch | 172 +++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 174 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index e69df49..e4ab720 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ nco (4.5.5-1) UNRELEASED; urgency=medium
* Update Vcs-Git URL to use HTTPS.
* Use GitHub for upstream sources.
* Drop typos.patch, applied upstream.
+ * Add patch for various new typos.
-- Bas Couwenberg <sebastic at debian.org> Sat, 27 Feb 2016 18:12:33 +0100
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..002796a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+typos.patch
diff --git a/debian/patches/typos.patch b/debian/patches/typos.patch
new file mode 100644
index 0000000..85fb84f
--- /dev/null
+++ b/debian/patches/typos.patch
@@ -0,0 +1,172 @@
+Description: Fix various typos.
+ doesnt -> doesn't
+ existance -> existence
+ mamory -> memory
+ missmatch -> mismatch
+ occuring -> occurring
+ Refrence -> Reference
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://github.com/nco/nco/pull/25
+
+--- a/src/nco++/ncoGrammer.g
++++ b/src/nco++/ncoGrammer.g
+@@ -953,7 +953,7 @@ if( nbr_dmn!=lmt_init(lmt,ast_lmt_vtr) )
+ int wlk_nbr);
+
+ if(tr== ANTLR_USE_NAMESPACE(antlr)nullAST)
+- err_prn("run_dbl"," REPORTS given a null AST Refrence\n");
++ err_prn("run_dbl"," REPORTS given a null AST Reference\n");
+
+ //small list dont bother with double parsing
+ // just do a final parse
+@@ -1981,7 +1981,7 @@ end0: if(lmt->getNextSibling() &
+ }
+
+ if( var_rhs->sz != var_lhs->sz)
+- err_prn(fnc_nm,"regular assign - var size missmatch between \""+var_nm+"\" and RHS of expression");
++ err_prn(fnc_nm,"regular assign - var size mismatch between \""+var_nm+"\" and RHS of expression");
+
+ var_lhs->val.vp=var_rhs->val.vp;
+
+@@ -2074,7 +2074,7 @@ end0: if(lmt->getNextSibling() &
+ {
+ // check size
+ if( var_rhs->sz!=1L && var_rhs->sz != cnt)
+- err_prn(fnc_nm,"Hyperslab limits for attribute "+att_nm + " on LHS size="+nbr2sng(cnt)+ " doesnt match RHS size=" + nbr2sng(var_rhs->sz));
++ err_prn(fnc_nm,"Hyperslab limits for attribute "+att_nm + " on LHS size="+nbr2sng(cnt)+ " doesn't match RHS size=" + nbr2sng(var_rhs->sz));
+
+
+ szn=(var_rhs->sz >1 ? 1: 0);
+@@ -2121,7 +2121,7 @@ end0: if(lmt->getNextSibling() &
+
+ // check size
+ if( var_rhs->sz!=1L && var_rhs->sz != cnt)
+- err_prn(fnc_nm,"Hyperslab limits for attribute "+att_nm + " on LHS size="+nbr2sng(cnt)+ " doesnt match RHS size=" + nbr2sng(var_rhs->sz));
++ err_prn(fnc_nm,"Hyperslab limits for attribute "+att_nm + " on LHS size="+nbr2sng(cnt)+ " doesn't match RHS size=" + nbr2sng(var_rhs->sz));
+
+
+ nco_var_cnf_typ(var_lhs->type,var_rhs);
+--- a/src/nco++/ncoTree.hpp
++++ b/src/nco++/ncoTree.hpp
+@@ -351,7 +351,7 @@ if( nbr_dmn!=lmt_init(lmt,ast_lmt_vtr) )
+ int wlk_nbr);
+
+ if(tr== ANTLR_USE_NAMESPACE(antlr)nullAST)
+- err_prn("run_dbl"," REPORTS given a null AST Refrence\n");
++ err_prn("run_dbl"," REPORTS given a null AST Reference\n");
+
+ //small list dont bother with double parsing
+ // just do a final parse
+--- a/src/nco++/ncoTree.cpp
++++ b/src/nco++/ncoTree.cpp
+@@ -3234,7 +3234,7 @@ var_sct * ncoTree::assign(ANTLR_USE_NAME
+ }
+
+ if( var_rhs->sz != var_lhs->sz)
+- err_prn(fnc_nm,"regular assign - var size missmatch between \""+var_nm+"\" and RHS of expression");
++ err_prn(fnc_nm,"regular assign - var size mismatch between \""+var_nm+"\" and RHS of expression");
+
+ var_lhs->val.vp=var_rhs->val.vp;
+
+@@ -3368,7 +3368,7 @@ var_sct * ncoTree::assign(ANTLR_USE_NAME
+ {
+ // check size
+ if( var_rhs->sz!=1L && var_rhs->sz != cnt)
+- err_prn(fnc_nm,"Hyperslab limits for attribute "+att_nm + " on LHS size="+nbr2sng(cnt)+ " doesnt match RHS size=" + nbr2sng(var_rhs->sz));
++ err_prn(fnc_nm,"Hyperslab limits for attribute "+att_nm + " on LHS size="+nbr2sng(cnt)+ " doesn't match RHS size=" + nbr2sng(var_rhs->sz));
+
+
+ szn=(var_rhs->sz >1 ? 1: 0);
+@@ -3415,7 +3415,7 @@ var_sct * ncoTree::assign(ANTLR_USE_NAME
+
+ // check size
+ if( var_rhs->sz!=1L && var_rhs->sz != cnt)
+- err_prn(fnc_nm,"Hyperslab limits for attribute "+att_nm + " on LHS size="+nbr2sng(cnt)+ " doesnt match RHS size=" + nbr2sng(var_rhs->sz));
++ err_prn(fnc_nm,"Hyperslab limits for attribute "+att_nm + " on LHS size="+nbr2sng(cnt)+ " doesn't match RHS size=" + nbr2sng(var_rhs->sz));
+
+
+ nco_var_cnf_typ(var_lhs->type,var_rhs);
+--- a/src/nco/nco_aux.c
++++ b/src/nco/nco_aux.c
+@@ -286,7 +286,7 @@ nco_aux_evl
+ lmt_tpl.max_idx=lmt_tpl.end=cll_idx_min+cll_nbr_cns-1;
+ lmt_tpl.cnt=cll_nbr_cns;
+ (*lmt_nbr)++;
+- if(*lmt_nbr > MAX_LMT_NBR) nco_err_exit(0,"%s: Number of slabs exceeds allocated mamory");
++ if(*lmt_nbr > MAX_LMT_NBR) nco_err_exit(0,"%s: Number of slabs exceeds allocated memory");
+ lmt[(*lmt_nbr)-1]=(lmt_sct *)nco_malloc(sizeof(lmt_sct));
+ *lmt[(*lmt_nbr)-1]=lmt_tpl;
+ cll_grp_nbr++;
+@@ -509,7 +509,7 @@ nco_aux_evl_trv
+ lmt_tpl.max_idx=lmt_tpl.end=cll_idx_min+cll_nbr_cns-1;
+ lmt_tpl.cnt=cll_nbr_cns;
+ (*aux_lmt_nbr)++;
+- if(*aux_lmt_nbr > MAX_LMT_NBR) nco_err_exit(0,"%s: Number of slabs exceeds allocated mamory");
++ if(*aux_lmt_nbr > MAX_LMT_NBR) nco_err_exit(0,"%s: Number of slabs exceeds allocated memory");
+ lmt[(*aux_lmt_nbr)-1]=(lmt_sct *)nco_malloc(sizeof(lmt_sct));
+ *lmt[(*aux_lmt_nbr)-1]=lmt_tpl;
+ cll_grp_nbr++;
+--- a/bm/NCO_rgr.pm
++++ b/bm/NCO_rgr.pm
+@@ -2680,7 +2680,7 @@ if($RUN_NETCDF4_TESTS_VERSION_GE_431){
+
+ #ncks #105
+ # Test that -x exclusion of coordinate variables only works with -C
+-# fxm: -x is not directly tested because it means testing for non-existance in output. how to do this?
++# fxm: -x is not directly tested because it means testing for non-existence in output. how to do this?
+ # ncks -O -x -v time ~/nco/data/in.nc ~/foo.nc
+ # ncks -H -C -d time,0 -v time ~/foo.nc
+ $dsc_sng="Test that -x exclusion of coordinate variables only works with -C";
+--- a/doc/nco.texi
++++ b/doc/nco.texi
+@@ -2437,7 +2437,7 @@ Leaks cause peak memory usage to increas
+ regardless of script complexity.
+ Slow leaks are very difficult to find.
+ Sometimes a @command{malloc()} (or @command{new[]}) failure is the
+-only noticeable clue to their existance.
++only noticeable clue to their existence.
+ If you have good reasons to believe that a memory allocation failure
+ is ultimately due to an @acronym{NCO} memory leak (rather than
+ inadequate @acronym{RAM} on your system), then we would be very
+@@ -15536,7 +15536,7 @@ not rank, while, @command{ncwa} changes
+ In this case the input files to @command{ncbo}, @var{file_1} and
+ @var{file_2}, will have unequally sized @code{time} dimensions which
+ causes @command{ncbo} to fail.
+-To prevent this from occuring, use @command{ncwa} to remove the
++To prevent this from occurring, use @command{ncwa} to remove the
+ @code{time} dimension from @var{file_2}.
+ See the example below.
+
+--- a/src/nco++/ncap2.cc
++++ b/src/nco++/ncap2.cc
+@@ -96,7 +96,7 @@ int
+ main(int argc,char **argv)
+ {
+ const char fnc_nm[]="main";
+- FILE *yyin; /* File handle used to check file existance */
++ FILE *yyin; /* File handle used to check file existence */
+ int parse_antlr(std::vector<prs_cls> &prs_vtr ,char*,char*);
+
+ /* fxm TODO nco652 */
+--- a/src/nco/nco_mmr.c
++++ b/src/nco/nco_mmr.c
+@@ -199,7 +199,7 @@ nco_malloc_err_hnt_prn /* [fnc] Explain
+ (void)
+ {
+ /* Purpose: Explain meaning and workarounds for malloc() failures */
+- (void)fprintf(stdout,"%s: INFO NCO has reported a malloc() failure. malloc() failures usually indicate that your machine does not have enough free memory (RAM+swap) to perform the requested operation. As such, malloc() failures result from the physical limitations imposed by your hardware. Read http://nco.sf.net/nco.html#mmr for a description of NCO memory usage. The likiest case is that this problem is caused by inadequate RAM on your system, and is not an NCO bug. If so, there are t [...]
++ (void)fprintf(stdout,"%s: INFO NCO has reported a malloc() failure. malloc() failures usually indicate that your machine does not have enough free memory (RAM+swap) to perform the requested operation. As such, malloc() failures result from the physical limitations imposed by your hardware. Read http://nco.sf.net/nco.html#mmr for a description of NCO memory usage. The likiest case is that this problem is caused by inadequate RAM on your system, and is not an NCO bug. If so, there are t [...]
+ } /* nco_malloc_err_hnt_prn() */
+
+ /* fxm: when are const qualifiers on return values legal? is this a GNUism? */
+--- a/man/ncbo.1
++++ b/man/ncbo.1
+@@ -149,7 +149,7 @@ dimensions which
+ causes
+ .B ncbo
+ to fail.
+-To prevent this from occuring, use
++To prevent this from occurring, use
+ .B ncwa
+ to remove the
+ .B time
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/nco.git
More information about the Pkg-grass-devel
mailing list