[Roadmap-commit] roadmap/src/gpx mkshort.c,1.3,1.4

[Paul F. <pg...@us...>]

Update of /cvsroot/roadmap/roadmap/src/gpx
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32228/gpx

Modified Files:
	mkshort.c 
Log Message:
suppress constant string compare warning


Index: mkshort.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/gpx/mkshort.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** mkshort.c	2 Oct 2006 14:20:20 -0000	1.3
--- mkshort.c	31 Jul 2008 20:45:19 -0000	1.4
***************
*** 31,35 ****
  
  #define DEFAULT_TARGET_LEN 8
! #define DEFAULT_BADCHARS "\"$.,'!-"
  
  /*
--- 31,35 ----
  
  #define DEFAULT_TARGET_LEN 8
! static char default_badchars[] = "\"$.,'!-";
  
  /*
***************
*** 88,92 ****
  
          h->whitespaceok = 1;
!         h->badchars = DEFAULT_BADCHARS;
          h->target_len = DEFAULT_TARGET_LEN;
          h->must_uniq = 1;
--- 88,92 ----
  
          h->whitespaceok = 1;
!         h->badchars = default_badchars;
          h->target_len = DEFAULT_TARGET_LEN;
          h->must_uniq = 1;
***************
*** 277,284 ****
          mkshort_handle *hdl = (mkshort_handle *) h;
  
!         if ((hdl->badchars != NULL) && (hdl->badchars != DEFAULT_BADCHARS))
                  xfree(hdl->badchars);
          if (s == NULL) {
!                 hdl->badchars = DEFAULT_BADCHARS;
          } else {
                  hdl->badchars = xstrdup(s);
--- 277,284 ----
          mkshort_handle *hdl = (mkshort_handle *) h;
  
!         if ((hdl->badchars != NULL) && (hdl->badchars != default_badchars))
                  xfree(hdl->badchars);
          if (s == NULL) {
!                 hdl->badchars = default_badchars;
          } else {
                  hdl->badchars = xstrdup(s);