This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository osmctools.
commit 7bd84481724b88bf0c4587f749e5c3a18f1e81b6 Author: Bas Couwenberg <[email protected]> Date: Tue Apr 14 22:07:23 2015 +0200 Imported Upstream version 0.5 --- src/osmconvert.c | 17 +++++++++-------- src/osmfilter.c | 10 +++++----- src/osmupdate.c | 11 +++-------- 3 files changed, 17 insertions(+), 21 deletions(-) diff --git a/src/osmconvert.c b/src/osmconvert.c index 3c57700..94c31ed 100644 --- a/src/osmconvert.c +++ b/src/osmconvert.c @@ -1,10 +1,10 @@ -// osmconvert 2014-11-15 21:10 -#define VERSION "0.8.3" +// osmconvert 2015-04-13 14:20 +#define VERSION "0.8.4" // // compile this file: // gcc osmconvert.c -lz -O3 -o osmconvert // -// (c) 2011..2014 Markus Weber, Nuernberg +// (c) 2011..2015 Markus Weber, Nuernberg // Richard Russo contributed the initiative to --add-bbox-tags option // // This program is free software; you can redistribute it and/or @@ -456,6 +456,7 @@ static int loglevel= 0; // logging to stderr; if((i%16)==0) fprintf(stderr,"\n "); \ fprintf(stderr," %02x",*pp++); } \ fprintf(stderr,"\n"); } } +#define UR(x) if(x){} // result value intentionally ignored #if __WIN32__ #define NL "\r\n" // use CR/LF as new-line sequence #define off_t off64_t @@ -5666,7 +5667,7 @@ static bool posr__writemode; // buffer is used for writing static inline void posr__flush() { if(!posr__writemode || posr__bufp==posr__buf) return; - write(posr__fd,posr__buf,(char*)posr__bufp-(char*)posr__buf); + UR(write(posr__fd,posr__buf,(char*)posr__bufp-(char*)posr__buf)) posr__bufp= posr__buf; } // end posr__flush() @@ -5947,7 +5948,7 @@ static bool rr__writemode; // buffer is used for writing static inline void rr__flush() { if(!rr__writemode || rr__bufp==rr__buf) return; - write(rr__fd,rr__buf,(char*)rr__bufp-(char*)rr__buf); + UR(write(rr__fd,rr__buf,(char*)rr__bufp-(char*)rr__buf)) rr__bufp= rr__buf; } // end rr__flush() @@ -6074,7 +6075,7 @@ static bool cwn__writemode; // buffer is used for writing static inline void cwn__flush() { if(!cwn__writemode || cwn__bufp==cwn__buf) return; - write(cwn__fd,cwn__buf,(char*)cwn__bufp-(char*)cwn__buf); + UR(write(cwn__fd,cwn__buf,(char*)cwn__bufp-(char*)cwn__buf)) cwn__bufp= cwn__buf; } // end cwn__flush() @@ -6205,7 +6206,7 @@ static bool cww__writemode; // buffer is used for writing static inline void cww__flush() { if(!cww__writemode || cww__bufp==cww__buf) return; - write(cww__fd,cww__buf,(char*)cww__bufp-(char*)cww__buf); + UR(write(cww__fd,cww__buf,(char*)cww__bufp-(char*)cww__buf)) cww__bufp= cww__buf; } // end cww__flush() @@ -11014,7 +11015,7 @@ static bool assistant(int* argcp,char*** argvp) { "(Zum Schließen dieses Fensters bitte die Eingabetaste druecken.)\n" }; #define DD(s) fprintf(stderr,"%s",(s[lang])); // display text - #define DI(s) fgets(s,sizeof(s),stdin); \ + #define DI(s) s[0]= 0; UR(fgets(s,sizeof(s),stdin)) \ if(strchr(s,'\r')!=NULL) *strchr(s,'\r')= 0; \ if(strchr(s,'\n')!=NULL) *strchr(s,'\n')= 0; // get user's response bool diff --git a/src/osmfilter.c b/src/osmfilter.c index 86d6363..adcd71f 100644 --- a/src/osmfilter.c +++ b/src/osmfilter.c @@ -1,10 +1,10 @@ -// osmfilter 2014-10-15 12:20 -#define VERSION "1.3A" +// osmfilter 2015-04-14 19:50 +#define VERSION "1.4.0" // // compile this file: // gcc osmfilter.c -O3 -o osmfilter // -// (c) 2011..2014 Markus Weber, Nuernberg +// (c) 2011..2015 Markus Weber, Nuernberg // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU Affero General Public License @@ -404,6 +404,7 @@ static byte digival_tab[]= { static int loglevel= 0; // logging to stderr; // 0: no logging; 1: small logging; 2: normal logging; // 3: extended logging; +#define UR(x) if(x){} // result value intentionally ignored #define DP(f) fprintf(stderr,"- Debug: " #f "\n"); #define DPv(f,...) fprintf(stderr,"- Debug: " #f "\n",__VA_ARGS__); #if __WIN32__ @@ -3014,7 +3015,7 @@ static bool rr__writemode; // buffer is used for writing static void rr__flush() { if(!rr__writemode || rr__bufp==rr__buf) return; - write(rr__fd,rr__buf,(char*)rr__bufp-(char*)rr__buf); + UR(write(rr__fd,rr__buf,(char*)rr__bufp-(char*)rr__buf)) rr__bufp= rr__buf; } // end rr__flush() @@ -6256,4 +6257,3 @@ return 5; } // verbose mode return r; } // end main() - diff --git a/src/osmupdate.c b/src/osmupdate.c index ff76042..5f77c10 100644 --- a/src/osmupdate.c +++ b/src/osmupdate.c @@ -1,10 +1,10 @@ -// osmupdate 2014-10-13 21:00 -#define VERSION "0.3H" +// osmupdate 2015-04-14 19:50 +#define VERSION "0.4.0" // // compile this file: // gcc osmupdate.c -o osmupdate // -// (c) 2011..2014 Markus Weber, Nuernberg +// (c) 2011..2015 Markus Weber, Nuernberg // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU Affero General Public License @@ -28,11 +28,6 @@ const char* helptext= "It also can assemble a new .osc or .o5c file which can be used to\n" "update your OSM data file at a later time.\n" "\n" -"If there is no file timestamp available within your input file, you\n" -"need to specify the appropriate timestamp manually. In this case, it\n" -"is recommended to pick a timestamp of one or two days earlier than\n" -"necessary, just to be on the save side.\n" -"\n" "Prequesites\n" "\n" "To run this program, please download and install two other programs\n" -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmctools.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
