Changeset 921 for trunk/zoo-project


Ignore:
Timestamp:
May 27, 2019, 3:03:29 PM (6 months ago)
Author:
djay
Message:

Fix issue building with gcc 7.3.0

Location:
trunk/zoo-project/zoo-kernel
Files:
14 edited

Legend:

Unmodified
Added
Removed
  • trunk/zoo-project/zoo-kernel/caching.c

    r917 r921  
    759759 
    760760  char ltmp1[256];
    761   sprintf(ltmp1,"%ld",fsize);
     761  sprintf(ltmp1,"%lld",fsize);
    762762  addToMap(*content,"size",ltmp1);
    763763  if(cached==NULL){
  • trunk/zoo-project/zoo-kernel/mimetypes.h

    r917 r921  
    839839
    840840static int isGeographic(const char* mimeType){
    841   char* imageMimeType[4]={
     841  const char* imageMimeType[4]={
    842842    "image/tiff",
    843843    "image/png",
     
    845845    "application/vnd.google-earth.kmz"
    846846  };
    847   char* vectorMimeType[5]={
     847  const char* vectorMimeType[5]={
    848848    "text/xml",
    849849    "application/json",
  • trunk/zoo-project/zoo-kernel/response_print.c

    r917 r921  
    2424
    2525#include "service.h"
     26#include "service_internal.h"
     27#include "server_internal.h"
    2628#include "response_print.h"
    27 #include "request_parser.h"
    28 #include "server_internal.h"
    29 #include "service_internal.h"
    3029#ifdef USE_MS
    3130#include "service_internal_ms.h"
     
    3534#ifdef USE_CALLBACK
    3635#include "service_callback.h"
    37 #endif
    38 
    39 #ifndef TRUE
    40 #define TRUE 1
    41 #endif
    42 #ifndef FALSE
    43 #define FALSE -1
    4436#endif
    4537
  • trunk/zoo-project/zoo-kernel/response_print.h

    r917 r921  
    6464#include <sys/stat.h>
    6565#include <sys/types.h>
     66//#include "cgic.h"
    6667#ifndef WIN32
    6768#include <sys/ipc.h>
     
    8384#include <locale.h> // knut: this appears to be a non-standard header file that has been removed in newer versions of glibc; it may be sufficient to include <locale.h> (see above)
    8485#endif
    85 #include "ulinet.h"
    8686
    8787#include "service.h"
     
    9696#include <libxml/xpath.h>
    9797
    98 #include "cgic.h"
    99 
    10098#ifdef __cplusplus
    10199extern "C" {
     
    173171   * Definitions of root node for response depending on the request and the WPS version
    174172   */
    175   static const char root_nodes[2][4][20]={
     173  static const char* root_nodes[2][4]={
    176174    {"ProcessOfferings","ProcessDescriptions","ExecuteResponse",NULL},
    177175    {"Contents","ProcessOfferings","Result",NULL}
  • trunk/zoo-project/zoo-kernel/server_internal.c

    r917 r921  
    738738           * content map.
    739739           */
    740           char* keys[4]={
     740          const char* keys[4]={
    741741            "minOccurs",
    742742            "maxOccurs",
  • trunk/zoo-project/zoo-kernel/server_internal.h

    r789 r921  
    2929#ifndef IMPORTSERVICE
    3030#define IMPORTSERVICE "include" // default name of [include] block in main.cfg
    31 #endif
    3231
    33 #include "ulinet.h"
    3432#include "service.h"
    3533#include <openssl/sha.h>
     
    7977}
    8078#endif
     79
     80#endif
  • trunk/zoo-project/zoo-kernel/service_internal.c

    r917 r921  
    874874    VSILFILE * fichier=VSIFOpenL(dataSource,"rb");
    875875    VSIStatBufL file_status;
    876     VSIStatL(dataSource, &file_status);
    877     if(fichier==NULL){
     876    int res=VSIStatL(dataSource, &file_status);
     877    if(fichier==NULL || res<0){
    878878      char tmp[1024];
    879       sprintf(tmp,"Failed to open file %s for reading purpose. File seems empty %lld.",
     879      sprintf(tmp,"Failed to open file %s for reading purpose. File seems empty %ld.",
    880880              dataSource,file_status.st_size);
    881881      setMapInMaps(conf,"lenv","message",tmp);
  • trunk/zoo-project/zoo-kernel/service_internal_ms.c

    r917 r921  
    860860      char extent[1024];
    861861      memset(&extent,0,1024);
    862       sprintf(extent,"%d,%d,%d,%d",oExt.MinX, oExt.MinY, oExt.MaxX, oExt.MaxY);
     862      sprintf(extent,"%f,%f,%f,%f",oExt.MinX, oExt.MinY, oExt.MaxX, oExt.MaxY);
    863863      setMapArray(output->content,"boundingbox",imyIndex,extent);
    864864    }
     
    10901090      char extent[1024];
    10911091      memset(&extent,0,1024);
    1092       sprintf(extent,"%d,%d,%d,%d",minX,minY,maxX,maxY);
     1092      sprintf(extent,"%f,%f,%f,%f",minX,minY,maxX,maxY);
    10931093      setMapArray(output->content,"boundingbox",imyIndex,extent);
    10941094    }
  • trunk/zoo-project/zoo-kernel/service_internal_ms.h

    r917 r921  
    2626
    2727#include <sys/stat.h>
    28 #include "service_internal.h"
    2928#include "service.h"
    3029#include "cpl_conv.h"
     
    3332#include "gdal.h"
    3433#include "ogr_srs_api.h"
    35 #include "ulinet.h"
    3634#ifdef WIN32
    3735#include <unistd.h>
  • trunk/zoo-project/zoo-kernel/service_internal_python.c

    r917 r921  
    151151
    152152#ifdef WIN32
    153   char* os_pathsep = ";";
     153  const char* os_pathsep = ";";
    154154#else
    155   char* os_pathsep = ":";
     155  const char* os_pathsep = ":";
    156156#endif
    157157
  • trunk/zoo-project/zoo-kernel/sqlapi.c

    r917 r921  
    5858 * @return the OGR connection string
    5959 */
    60 char* _createInitString(maps* conf,const char* key){
     60const char* _createInitString(maps* conf,const char* key){
    6161  char* res=NULL;
    6262  char keywords[6][14]={
  • trunk/zoo-project/zoo-kernel/sqlapi.h

    r917 r921  
    5353 
    5454#ifdef META_DB
    55   ZOO_DLL_EXPORT char* _createInitString(maps*,const char*);
     55  ZOO_DLL_EXPORT const char* _createInitString(maps*,const char*);
    5656  ZOO_DLL_EXPORT int _init_sql(maps*,const char*);
    5757  ZOO_DLL_EXPORT OGRLayer *fetchSql(maps*,int,const char*);
  • trunk/zoo-project/zoo-kernel/ulinet.h

    r917 r921  
    2424
    2525#ifndef _ULINET_H
    26 #define _ULINET_H
     26#define _ULINET_H 1
    2727
     28#include "fcgi_stdio.h"
    2829#include <stdlib.h>
    2930#include <fcntl.h>
  • trunk/zoo-project/zoo-kernel/zoo_service_loader.c

    r917 r921  
    4545#endif
    4646
     47#ifdef USE_PYTHON
     48#include "service_internal_python.h"
     49#endif
     50
    4751#include "cgic.h"
    4852
     
    7276#ifdef META_DB
    7377#include "meta_sql.h"
    74 #endif
    75 
    76 #ifdef USE_PYTHON
    77 #include "service_internal_python.h"
    7878#endif
    7979
Note: See TracChangeset for help on using the changeset viewer.

Search

Context Navigation

ZOO Sponsors

http://www.zoo-project.org/trac/chrome/site/img/geolabs-logo.pnghttp://www.zoo-project.org/trac/chrome/site/img/neogeo-logo.png http://www.zoo-project.org/trac/chrome/site/img/apptech-logo.png http://www.zoo-project.org/trac/chrome/site/img/3liz-logo.png http://www.zoo-project.org/trac/chrome/site/img/gateway-logo.png

Become a sponsor !

Knowledge partners

http://www.zoo-project.org/trac/chrome/site/img/ocu-logo.png http://www.zoo-project.org/trac/chrome/site/img/gucas-logo.png http://www.zoo-project.org/trac/chrome/site/img/polimi-logo.png http://www.zoo-project.org/trac/chrome/site/img/fem-logo.png http://www.zoo-project.org/trac/chrome/site/img/supsi-logo.png http://www.zoo-project.org/trac/chrome/site/img/cumtb-logo.png

Become a knowledge partner

Related links

http://zoo-project.org/img/ogclogo.png http://zoo-project.org/img/osgeologo.png