Skip to content
Browse files

remove MSCVSID usage

  • Loading branch information...
1 parent 30a95cc commit 44b38367f2b33521e495bc23966f3831d1fbda08 @tbonfort tbonfort committed May 22, 2012
Showing with 86 additions and 97 deletions.
  1. +1 −1 cgiutil.c
  2. +1 −1 classobject.c
  3. +1 −1 layerobject.c
  4. +1 −1 legend.c
  5. +1 −1 mapbits.c
  6. +1 −1 mapchart.c
  7. +1 −1 mapcluster.c
  8. +1 −1 mapcontext.c
  9. +1 −1 mapcopy.c
  10. +1 −1 mapcpl.c
  11. +1 −1 mapcrypto.c
  12. +1 −1 mapdebug.c
  13. +1 −1 mapdraw.c
  14. +1 −1 mapdrawgdal.c
  15. +1 −1 maperror.c
  16. +1 −1 mapfile.c
  17. +1 −1 mapgdal.c
  18. +1 −1 mapgml.c
  19. +1 −1 mapgraticule.c
  20. +1 −1 maphash.c
  21. +1 −1 maphttp.c
  22. +1 −1 mapimageio.c
  23. +1 −1 mapimagemap.c
  24. +1 −1 mapio.c
  25. +1 −1 mapjoin.c
  26. +1 −1 maplabel.c
  27. +1 −1 maplayer.c
  28. +1 −1 maplegend.c
  29. +1 −1 maplibxml2.c
  30. +1 −1 mapmssql2008.c
  31. +1 −1 mapobject.c
  32. +1 −1 mapogcfilter.c
  33. +1 −1 mapogcfiltercommon.c
  34. +1 −1 mapogcsld.c
  35. +1 −1 mapogcsos.c
  36. +1 −1 mapogl.cpp
  37. +1 −1 mapoglcontext.cpp
  38. +1 −1 mapoglrenderer.cpp
  39. +1 −1 mapogr.cpp
  40. +1 −1 mapogroutput.c
  41. +1 −1 maporaclespatial.c
  42. +1 −1 mapoutput.c
  43. +1 −1 mapows.c
  44. +1 −1 mapowscommon.c
  45. +1 −1 mappluginlayer.c
  46. +1 −1 mappool.c
  47. +1 −1 mappostgis.c
  48. +1 −1 mappostgresql.c
  49. +1 −1 mapprimitive.c
  50. +1 −1 mapproject.c
  51. +1 −1 mapquery.c
  52. +1 −1 mapraster.c
  53. +1 −1 maprasterquery.c
  54. +1 −1 mapresample.c
  55. +1 −1 mapscale.c
  56. +1 −1 mapsearch.c
  57. +1 −1 mapserv.c
  58. +0 −11 mapserver.h
  59. +1 −1 mapshape.c
  60. +1 −1 mapstring.c
  61. +1 −1 mapsymbol.c
  62. +1 −1 maptclutf.c
  63. +1 −1 maptemplate.c
  64. +1 −1 mapthread.c
  65. +1 −1 maptime.c
  66. +1 −1 maptree.c
  67. +1 −1 mapunion.c
  68. +1 −1 maputil.c
  69. +1 −1 mapwcs.c
  70. +1 −1 mapwcs11.c
  71. +1 −1 mapwcs20.c
  72. +1 −1 mapwfs.c
  73. +1 −1 mapwfs11.c
  74. +1 −1 mapwfslayer.c
  75. +1 −1 mapwms.c
  76. +1 −1 mapxbase.c
  77. +1 −1 msencrypt.c
  78. +1 −1 scalebar.c
  79. +1 −1 shp2img.c
  80. +1 −1 shptree.c
  81. +1 −1 shptreetst.c
  82. +1 −1 shptreevis.c
  83. +1 −1 sortshp.c
  84. +1 −1 sym2img.c
  85. +1 −1 testcopy.c
  86. +1 −1 testexpr.c
  87. +1 −1 tile4ms.c
View
2 cgiutil.c
@@ -36,7 +36,7 @@
#include "mapserver.h"
#include "cgiutil.h"
-MS_CVSID("$Id$")
+
#define LF 10
#define CR 13
View
2 classobject.c
@@ -36,7 +36,7 @@
# include "cpl_conv.h"
#endif
-MS_CVSID("$Id$")
+
/*
** Add a label to a classObj (order doesn't matter for labels like it does with styles)
View
2 layerobject.c
@@ -36,7 +36,7 @@
# include "cpl_conv.h"
#endif
-MS_CVSID("$Id$")
+
/* ===========================================================================
msInsertClass
View
2 legend.c
@@ -29,7 +29,7 @@
#include "mapserver.h"
-MS_CVSID("$Id$")
+
int main(int argc, char *argv[])
{
View
2 mapbits.c
@@ -32,7 +32,7 @@
#include "mapserver.h"
-MS_CVSID("$Id$")
+
#include <limits.h>
View
2 mapchart.c
@@ -30,7 +30,7 @@
#include "mapserver.h"
-MS_CVSID("$Id$")
+
#define MS_CHART_TYPE_PIE 1
#define MS_CHART_TYPE_BAR 2
View
2 mapcluster.c
@@ -33,7 +33,7 @@
#include <assert.h>
#include "mapserver.h"
-MS_CVSID("$Id$")
+
#ifdef USE_CLUSTER_PLUGIN
View
2 mapcontext.c
@@ -28,7 +28,7 @@
#include "mapserver.h"
-MS_CVSID("$Id$")
+
#if defined(USE_WMS_LYR) && defined(USE_OGR)
View
2 mapcopy.c
@@ -45,7 +45,7 @@
#include "mapserver.h"
#include "mapsymbol.h"
-MS_CVSID("$Id$")
+
#include "mapcopy.h"
View
2 mapcpl.c
@@ -41,7 +41,7 @@
#include <assert.h>
#include "mapserver.h"
-MS_CVSID("$Id$")
+
/* should be size of largest possible filename */
#define MS_PATH_BUF_SIZE 2048
View
2 mapcrypto.c
@@ -34,7 +34,7 @@
#include "mapserver.h"
-MS_CVSID("$Id$")
+
/**********************************************************************
View
2 mapdebug.c
@@ -48,7 +48,7 @@
#include <windows.h> /* OutputDebugStringA() */
#endif
-MS_CVSID("$Id$")
+
#ifndef USE_THREAD
View
2 mapdraw.c
@@ -33,7 +33,7 @@
#include "maptime.h"
#include "mapcopy.h"
-MS_CVSID("$Id$")
+
#ifdef USE_GD
/*
View
2 mapdrawgdal.c
@@ -33,7 +33,7 @@
#include "mapresample.h"
#include "mapthread.h"
-MS_CVSID("$Id$")
+
extern int InvGeoTransform( double *gt_in, double *gt_out );
View
2 maperror.c
@@ -39,7 +39,7 @@
#endif
#include <stdarg.h>
-MS_CVSID("$Id$")
+
static char *ms_errorCodes[MS_NUMERRORCODES] = {"",
"Unable to access file.",
View
2 mapfile.c
@@ -43,7 +43,7 @@
# include "gdal.h"
#endif
-MS_CVSID("$Id$")
+
extern int msyylex(void);
extern void msyyrestart(FILE *);
View
2 mapgdal.c
@@ -31,7 +31,7 @@
#include "mapserver.h"
#include "mapthread.h"
-MS_CVSID("$Id$")
+
#if defined(USE_GDAL) || defined(USE_OGR)
#include "cpl_conv.h"
View
2 mapgml.c
@@ -31,7 +31,7 @@
#include "maperror.h"
#include "mapgml.h"
-MS_CVSID("$Id$")
+
/* Use only mapgml.c if WMS or WFS is available (with minor exceptions at end)*/
View
2 mapgraticule.c
@@ -30,7 +30,7 @@
#include <assert.h>
#include "mapproject.h"
-MS_CVSID("$Id$")
+
/**********************************************************************************************************************
*
View
2 maphash.c
@@ -32,7 +32,7 @@
#include "mapserver.h"
#include "maphash.h"
-MS_CVSID("$Id$")
+
static unsigned hash(const char *key)
{
View
2 maphttp.c
@@ -37,7 +37,7 @@
#include "maperror.h"
#include "mapthread.h"
-MS_CVSID("$Id$")
+
#include <time.h>
#ifndef _WIN32
View
2 mapimageio.c
@@ -38,7 +38,7 @@
#include "gif_lib.h"
#endif
-MS_CVSID("$Id$")
+
typedef struct _streamInfo {
FILE *fp;
View
2 mapimagemap.c
@@ -38,7 +38,7 @@
#include <io.h>
#endif
-MS_CVSID("$Id$")
+
#define MYDEBUG 0
#define DEBUG_IF if (MYDEBUG > 2)
View
2 mapio.c
@@ -43,7 +43,7 @@
#endif
-MS_CVSID("$Id$")
+
static int is_msIO_initialized = MS_FALSE;
View
2 mapjoin.c
@@ -29,7 +29,7 @@
#include "mapserver.h"
-MS_CVSID("$Id$")
+
#define ROW_ALLOCATION_SIZE 10
View
2 maplabel.c
@@ -33,7 +33,7 @@
#include "mapserver.h"
-MS_CVSID("$Id$")
+
/**
View
2 maplayer.c
@@ -36,7 +36,7 @@
#include "mapparser.h"
#include <assert.h>
-MS_CVSID("$Id$")
+
static int populateVirtualTable(layerVTableObj *vtable);
View
2 maplegend.c
@@ -29,7 +29,7 @@
#include "mapserver.h"
-MS_CVSID("$Id$")
+
#define PSF .8
#define VMARGIN 5 /* margin at top and bottom of legend graphic */
View
2 maplibxml2.c
@@ -36,7 +36,7 @@
#include<libxml/xpath.h>
#include<libxml/xpathInternals.h>
-MS_CVSID("$Id$")
+
/**
* msLibXml2GenerateList()
View
2 mapmssql2008.c
@@ -49,7 +49,7 @@
#include <string.h>
#include <ctype.h> /* tolower() */
-MS_CVSID("$Id$")
+
/* Native geometry parser macros */
View
2 mapobject.c
@@ -35,7 +35,7 @@
# include "cpl_conv.h"
#endif
-MS_CVSID("$Id$")
+
void freeWeb(webObj *web);
void freeScalebar(scalebarObj *scalebar);
View
2 mapogcfilter.c
@@ -38,7 +38,7 @@
#include "mapserver.h"
#include "mapowscommon.h"
-MS_CVSID("$Id$")
+
int FLTIsNumeric(char *pszValue)
View
2 mapogcfiltercommon.c
@@ -34,7 +34,7 @@
#include "mapserver.h"
#include "mapowscommon.h"
-MS_CVSID("$Id$")
+
#ifdef USE_OGR
View
2 mapogcsld.c
@@ -34,7 +34,7 @@
#include "cpl_string.h"
#endif
-MS_CVSID("$Id$")
+
#define SLD_LINE_SYMBOL_NAME "sld_line_symbol"
#define SLD_LINE_SYMBOL_DASH_NAME "sld_line_symbol_dash"
View
2 mapogcsos.c
@@ -32,7 +32,7 @@
#include "mapserver.h"
-MS_CVSID("$Id$")
+
#if defined(USE_SOS_SVR) && defined(USE_LIBXML2)
View
2 mapogl.cpp
@@ -35,7 +35,7 @@
#include "mapoglrenderer.h"
#include "mapoglcontext.h"
-MS_CVSID("$Id$")
+
imageObj* createImageObjOgl(OglRenderer* renderer)
{
View
2 mapoglcontext.cpp
@@ -33,7 +33,7 @@
#include "maperror.h"
#include "mapoglcontext.h"
-MS_CVSID("$Id$")
+
#define _T(x) __TEXT(x)
View
2 mapoglrenderer.cpp
@@ -36,7 +36,7 @@
#include "maperror.h"
#include "mapoglrenderer.h"
-MS_CVSID("$Id$")
+
using namespace std;
View
2 mapogr.cpp
@@ -40,7 +40,7 @@
# include "ogr_srs_api.h"
#endif
-MS_CVSID("$Id$")
+
#define ACQUIRE_OGR_LOCK msAcquireLock( TLOCK_OGR )
#define RELEASE_OGR_LOCK msReleaseLock( TLOCK_OGR )
View
2 mapogroutput.c
@@ -41,7 +41,7 @@
# include "cpl_string.h"
#endif
-MS_CVSID("$Id$")
+
#ifdef USE_OGR
View
2 maporaclespatial.c
@@ -39,7 +39,7 @@
#include "mapserver.h"
#include <assert.h>
-MS_CVSID("$Id$")
+
#ifdef USE_ORACLESPATIAL
View
2 mapoutput.c
@@ -30,7 +30,7 @@
#include <assert.h>
#include "mapserver.h"
-MS_CVSID("$Id$")
+
static outputFormatObj *msAllocOutputFormat( mapObj *map, const char *name,
const char *driver );
View
2 mapows.c
@@ -42,7 +42,7 @@
#include <stdarg.h>
#include <assert.h>
-MS_CVSID("$Id$")
+
/*
** msOWSInitRequestObj() initializes an owsRequestObj; i.e: sets
View
2 mapowscommon.c
@@ -42,7 +42,7 @@
#include "mapowscommon.h"
#include "maplibxml2.h"
-MS_CVSID("$Id$")
+
View
2 mappluginlayer.c
@@ -30,7 +30,7 @@
#include "mapserver.h"
#include "mapthread.h"
-MS_CVSID("$Id$")
+
typedef struct {
char *name;
View
2 mappool.c
@@ -134,7 +134,7 @@ o The connection pooling API will let a connection be used/referenced multiple
#include "mapserver.h"
#include "mapthread.h"
-MS_CVSID("$Id$")
+
/* defines for lifetime.
A positive number is a time-from-last use in seconds */
View
2 mappostgis.c
@@ -80,7 +80,7 @@
#ifdef USE_POSTGIS
-MS_CVSID("$Id$")
+
/*
** msPostGISCloseConnection()
View
2 mappostgresql.c
@@ -50,7 +50,7 @@
#include <string.h>
#include <ctype.h> /* tolower() */
-MS_CVSID("$Id$")
+
typedef struct {
View
2 mapprimitive.c
@@ -32,7 +32,7 @@
#include <assert.h>
#include <locale.h>
-MS_CVSID("$Id$")
+
typedef enum {CLIP_LEFT, CLIP_MIDDLE, CLIP_RIGHT} CLIP_STATE;
View
2 mapproject.c
@@ -35,7 +35,7 @@
#include <sys/stat.h>
#include "mapaxisorder.h"
-MS_CVSID("$Id$")
+
#ifdef USE_PROJ
static int msTestNeedWrap( pointObj pt1, pointObj pt2, pointObj pt2_geo,
View
2 mapquery.c
@@ -29,7 +29,7 @@
#include "mapserver.h"
-MS_CVSID("$Id$")
+
int msInitQuery(queryObj *query)
{
View
2 mapraster.c
@@ -35,7 +35,7 @@
#include "mapresample.h"
#include "mapthread.h"
-MS_CVSID("$Id$")
+
extern int msyylex_destroy(void);
extern int yyparse(parseObj *);
View
2 maprasterquery.c
@@ -32,7 +32,7 @@
#include "mapresample.h"
#include "mapthread.h"
-MS_CVSID("$Id$")
+
int msRASTERLayerGetShape(layerObj *layer, shapeObj *shape, resultObj *record);
int msRASTERLayerGetItems(layerObj *layer);
View
2 mapresample.c
@@ -31,7 +31,7 @@
#include "mapresample.h"
#include "mapthread.h"
-MS_CVSID("$Id$")
+
#ifndef MAX
# define MIN(a,b) ((a<b) ? a : b)
View
2 mapscale.c
@@ -29,7 +29,7 @@
#include "mapserver.h"
-MS_CVSID("$Id$")
+
#define VMARGIN 3 /* buffer around the scalebar */
#define HMARGIN 3
View
2 mapsearch.c
@@ -35,7 +35,7 @@
#include "mapserver.h"
-MS_CVSID("$Id$")
+
#define LASTVERT(v,n) ((v) == 0 ? n-2 : v-1)
#define NEXTVERT(v,n) ((v) == n-2 ? 0 : v+1)
View
2 mapserv.c
@@ -39,7 +39,7 @@
#include <signal.h>
#endif
-MS_CVSID("$Id$")
+
/************************************************************************/
/* FastCGI cleanup functions. */
View
11 mapserver.h
@@ -65,17 +65,6 @@
#include <unistd.h>
#endif
-#ifndef DISABLE_CVSID
-#if defined(__GNUC__) && __GNUC__ >= 4
-# define MS_CVSID(string) static char ms_cvsid[] __attribute__((used)) = string;
-#else
-# define MS_CVSID(string) static char ms_cvsid[] = string; \
-static char *cvsid_aw() { return( cvsid_aw() ? ((char *) NULL) : ms_cvsid ); }
-#endif
-#else
-# define MS_CVSID(string)
-#endif
-
#if defined(_WIN32) && !defined(__CYGWIN__)
# define MS_DLL_EXPORT __declspec(dllexport)
#define USE_MSFREE
View
2 mapshape.c
@@ -38,7 +38,7 @@
#include <assert.h>
#include "mapserver.h"
-MS_CVSID("$Id$")
+
/* Only use this macro on 32-bit integers! */
#define SWAP_FOUR_BYTES(data) \
View
2 mapstring.c
@@ -33,7 +33,7 @@
#include "mapserver.h"
-MS_CVSID("$Id$")
+
#include <ctype.h>
#include <string.h>
View
2 mapsymbol.c
@@ -35,7 +35,7 @@
#include "mapcopy.h"
#include "mapthread.h"
-MS_CVSID("$Id$")
+
extern int msyylex(void); /* lexer globals */
extern void msyyrestart(FILE *);
View
2 maptclutf.c
@@ -89,7 +89,7 @@
#include "mapserver.h"
-MS_CVSID("$Id$")
+
/* The source code of Tcl_UtfToUniChar() was borrowed from tclUtf.c
View
2 maptemplate.c
@@ -37,7 +37,7 @@
#include <ctype.h>
-MS_CVSID("$Id$")
+
static char *olUrl = "http://www.mapserver.org/lib/OpenLayers-ms60.js";
static char *olTemplate = \
View
2 mapthread.c
@@ -137,7 +137,7 @@ files instead.
#include "mapserver.h"
#include "mapthread.h"
-MS_CVSID("$Id$")
+
#if defined(USE_THREAD)
static int thread_debug = 0;
View
2 maptime.c
@@ -36,7 +36,7 @@
#include "maptime.h"
#include "maperror.h"
-MS_CVSID("$Id$")
+
typedef struct {
char pattern[64];
View
2 maptree.c
@@ -31,7 +31,7 @@
#include "mapserver.h"
#include "maptree.h"
-MS_CVSID("$Id$")
+
/* -------------------------------------------------------------------- */
/* If the following is 0.5, nodes will be split in half. If it */
View
2 mapunion.c
@@ -33,7 +33,7 @@
#include <assert.h>
#include "mapserver.h"
-MS_CVSID("$Id$")
+
#define MSUNION_NUMITEMS 3
#define MSUNION_SOURCELAYERNAME "Union:SourceLayerName"
View
2 maputil.c
@@ -46,7 +46,7 @@
#include <process.h>
#endif
-MS_CVSID("$Id$")
+
extern char *msyystring_buffer;
extern int msyylex_destroy(void);
View
2 mapwcs.c
@@ -32,7 +32,7 @@
#include "mapthread.h"
#include <assert.h>
-MS_CVSID("$Id$")
+
#if defined(USE_WCS_SVR)
View
2 mapwcs11.c
@@ -35,7 +35,7 @@
#include "mapthread.h"
#include "mapwcs.h"
-MS_CVSID("$Id$")
+
#if defined(USE_WCS_SVR) && defined(USE_LIBXML2)
View
2 mapwcs20.c
@@ -53,7 +53,7 @@
#endif /* defined(USE_LIBXML2) */
-MS_CVSID("$Id$")
+
/************************************************************************/
/* msStringParseInteger() */
View
2 mapwfs.c
@@ -28,7 +28,7 @@
#include "mapserver.h"
-MS_CVSID("$Id$")
+
#if defined(USE_WFS_SVR)
View
2 mapwfs11.c
@@ -30,7 +30,7 @@
#include "mapserver.h"
#include "mapows.h"
-MS_CVSID("$Id$")
+
#if defined(USE_WFS_SVR) && defined(USE_LIBXML2)
#include "maplibxml2.h"
View
2 mapwfslayer.c
@@ -37,7 +37,7 @@
#include <process.h>
#endif
-MS_CVSID("$Id$")
+
#define WFS_V_0_0_14 14
#define WFS_V_1_0_0 100
View
2 mapwms.c
@@ -49,7 +49,7 @@
#include <process.h>
#endif
-MS_CVSID("$Id$")
+
/* ==================================================================
* WMS Server stuff.
View
2 mapxbase.c
@@ -34,7 +34,7 @@
#include <stdlib.h> /* for atof() and atoi() */
#include <math.h>
-MS_CVSID("$Id$")
+
/* try to use a large file version of fseek for files up to 4GB (#3514) */
#if _MSC_VER > 1310
View
2 msencrypt.c
@@ -29,7 +29,7 @@
#include "mapserver.h"
-MS_CVSID("$Id$")
+
void PrintUsage()
{
View
2 scalebar.c
@@ -29,7 +29,7 @@
#include "mapserver.h"
-MS_CVSID("$Id$")
+
int main(int argc, char *argv[])
{
View
2 shp2img.c
@@ -30,7 +30,7 @@
#include "mapserver.h"
#include "maptime.h"
-MS_CVSID("$Id$")
+
int main(int argc, char *argv[])
{
View
2 shptree.c
@@ -31,7 +31,7 @@
#include "maptree.h"
#include <string.h>
-MS_CVSID("$Id$")
+
char* AddFileSuffix ( const char * Filename, const char * Suffix ) {
char *pszFullname, *pszBasename;
View
2 shptreetst.c
@@ -34,7 +34,7 @@
#endif
#include <stdlib.h>
-MS_CVSID("$Id$")
+
#ifdef SHPT_POLYGON
#undef MAPSERVER
View
2 shptreevis.c
@@ -35,7 +35,7 @@
#endif
#include <stdlib.h>
-MS_CVSID("$Id$")
+
#ifdef SHPT_POLYGON
#undef MAPSERVER
View
2 sortshp.c
@@ -36,7 +36,7 @@
#include "mapserver.h"
-MS_CVSID("$Id$")
+
typedef struct {
double number;
View
2 sym2img.c
@@ -32,7 +32,7 @@
#include "mapserver.h"
-MS_CVSID("$Id$")
+
#define MAXCOLORS 256
#define CELLSIZE 100
View
2 testcopy.c
@@ -29,7 +29,7 @@
#include "mapserver.h"
-MS_CVSID("$Id$")
+
void printAtts(mapObj*, const char*);
View
2 testexpr.c
@@ -33,7 +33,7 @@
#include "mapparser.h"
#include "mapfile.h"
-MS_CVSID("$Id$")
+
extern int msyyparse();
extern int msyylex();
View
2 tile4ms.c
@@ -43,7 +43,7 @@
#include "mapserver.h"
#include <string.h>
-MS_CVSID("$Id$")
+
/***********************************************************************/
int process_shapefiles(char *metaFileNameP, char *tileFileNameP,

0 comments on commit 44b3836

Please sign in to comment.
Something went wrong with that request. Please try again.