Changeset 899


Ignore:
Timestamp:
Mar 22, 2019, 12:13:18 PM (6 years ago)
Author:
djay
Message:

Fix header files location

Location:
branches/prototype-v0/zoo-project/zoo-kernel
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • branches/prototype-v0/zoo-project/zoo-kernel/Makefile.in

    r880 r899  
    99
    1010service.o: service.c service.h
    11         gcc ${YAML_CFLAGS} ${XML2CFLAGS} ${CFLAGS} -fPIC -c service.c
     11        g++ ${YAML_CFLAGS} ${XML2CFLAGS} ${CFLAGS} -fPIC -c service.c
    1212
    1313main_conf_read.tab.c: main_conf_read.y service.h
    … …  
    6666
    6767service_yaml.o: service_yaml.c service.h
    68         gcc ${YAML_CFLAGS} ${XML2CFLAGS} ${CFLAGS} -fPIC -c service_yaml.c
     68        g++ ${YAML_CFLAGS} ${XML2CFLAGS} ${CFLAGS} -fPIC -c service_yaml.c
    6969
    7070meta_sql.o: meta_sql.c meta_sql.h service.h

  • branches/prototype-v0/zoo-project/zoo-kernel/caching.c

    r890 r899  
    3838 */
    3939char* getMd5(char* url){
    40   EVP_MD_CTX md5ctx;
     40  EVP_MD_CTX *md5ctx=EVP_MD_CTX_create();
    4141  char* fresult=(char*)malloc((EVP_MAX_MD_SIZE+1)*sizeof(char));
    4242  unsigned char result[EVP_MAX_MD_SIZE];
    4343  unsigned int len;
    44   EVP_DigestInit(&md5ctx, EVP_md5());
    45   EVP_DigestUpdate(&md5ctx, url, strlen(url));
    46   EVP_DigestFinal_ex(&md5ctx,result,&len);
    47   EVP_MD_CTX_cleanup(&md5ctx);
     44  EVP_DigestInit(md5ctx, EVP_md5());
     45  EVP_DigestUpdate(md5ctx, url, strlen(url));
     46  EVP_DigestFinal_ex(md5ctx,result,&len);
     47  EVP_MD_CTX_destroy(md5ctx);
    4848  int i;
    4949  for(i = 0; i < len; i++){
    … …  
    7979    EVP_DigestUpdate(md5ctx, data, bytes);
    8080  EVP_DigestFinal_ex(md5ctx,result,&len);
    81   EVP_MD_CTX_cleanup(md5ctx);
    8281  EVP_MD_CTX_destroy(md5ctx);
    8382  int i;

  • branches/prototype-v0/zoo-project/zoo-kernel/response_print.h

    r896 r899  
    3838
    3939#include <libintl.h>
    40 //#include <xlocale.h> //#include <xlocale>
    4140#include <locale.h>
    4241
    … …  
    6564#include <sys/stat.h>
    6665#include <sys/types.h>
    67 #include "cgic.h"
    6866#ifndef WIN32
    6967#include <sys/ipc.h>
    … …  
    9795#include <libxml/parser.h>
    9896#include <libxml/xpath.h>
     97
     98#include "cgic.h"
    9999
    100100#ifdef __cplusplus

  • branches/prototype-v0/zoo-project/zoo-kernel/service.c

    r896 r899  
    22 * Author : Gérald FENOY
    33 *
    4  * Copyright (c) 2015 GeoLabs SARL
     4 * Copyright (c) 2015-2019 GeoLabs SARL
    55 *
    66 * Permission is hereby granted, free of charge, to any person obtaining a copy
    … …  
    2828#include <ctime>
    2929#include <chrono>
     30#ifdef WIN32
    3031#include <process.h>
     32#endif
    3133
    3234#if defined(_MSC_VER) && _MSC_VER < 1800
    … …  
    17841786
    17851787        snprintf(text, msglen, "pid: %d %s line %d %s() %s systime: %lld ns ticks: %lld %s\n",
    1786                 _getpid(), source, line, function, str, sys_t, proc_t, message); // __FILE__ __LINE__ __func__ //
     1788                zGetpid(), source, line, function, str, sys_t, proc_t, message); // __FILE__ __LINE__ __func__ //
    17871789
    17881790        if (file != NULL && (log = fopen(file, "a+")) != NULL) {

  • branches/prototype-v0/zoo-project/zoo-kernel/service.h

    r896 r899  
    22 * Author : Gérald FENOY
    33 *
    4  * Copyright (c) 2009-2015 GeoLabs SARL
     4 * Copyright (c) 2009-2019 GeoLabs SARL
    55 *
    66 * Permission is hereby granted, free of charge, to any person obtaining a copy
    … …  
    475475  ZOO_DLL_EXPORT bool nonempty(map* map);
    476476  ZOO_DLL_EXPORT bool hasvalue(maps* source, const char* node, const char* key, map** kvp);
     477#ifdef __cplusplus
    477478  ZOO_DLL_EXPORT void setErrorMessage(maps*& conf, const char* service, WPSException exc, const char* message = NULL);
    478479  ZOO_DLL_EXPORT void logMessage(const char* source, const char* function, int line, const char* file = NULL, const char* message = NULL);
     480#endif
    479481  #define zooLogMsg(file,message) logMessage(__FILE__, __func__, __LINE__, (file), (message))
    480482  #define zooLog logMessage(__FILE__, __func__, __LINE__) 

  • branches/prototype-v0/zoo-project/zoo-kernel/service_callback.c

    r886 r899  
    22 * Author : Gérald FENOY
    33 *
    4  *  Copyright 2017 GeoLabs SARL. All rights reserved.
     4 *  Copyright 2017-2019 GeoLabs SARL. All rights reserved.
    55 *
    66 * This work was supported by public funds received in the framework of GEOSUD,
    … …  
    132132    if(!CHECK_INET_HANDLE(hInternet)){
    133133      InternetCloseHandle (&hInternet);
    134       return false;
     134      return NULL;
    135135    }
    136136    char *URL=(char*)malloc((strlen(arg->url->value)+5)*sizeof(char));

  • branches/prototype-v0/zoo-project/zoo-kernel/service_internal.c

    r897 r899  
    929929 */
    930930char* file_exists(const char* dir, const char* name) {
    931         char* d = (dir != NULL ? dir : ".");
     931        const char* d = (dir != NULL ? dir : ".");
    932932        if (name != NULL) {
    933933                size_t length = strlen(d) + strlen(name) + 2; // including file separator and \0 character

  • branches/prototype-v0/zoo-project/zoo-kernel/service_internal.h

    r896 r899  
    6767#include <sys/stat.h>
    6868#include <sys/types.h>
    69 #include "cgic.h"
    7069#ifndef WIN32
    7170#include <sys/ipc.h>

  • branches/prototype-v0/zoo-project/zoo-kernel/service_internal_hpc.c

    r895 r899  
    3434#include "mimetypes.h"
    3535#include <sys/un.h>
     36#include "cgic.h"
    3637
    3738typedef struct {

  • branches/prototype-v0/zoo-project/zoo-kernel/service_internal_hpc.h

    r839 r899  
    3434#include "service_internal.h"
    3535#include "service.h"
    36 #include "cgic.h"
    3736#ifdef WIN32
    3837#include <windows.h>

  • branches/prototype-v0/zoo-project/zoo-kernel/service_internal_python.h

    r640 r899  
    22 * Author : Gérald FENOY
    33 *
    4  * Copyright (c) 2009-2010 GeoLabs SARL
     4 * Copyright (c) 2009-2019 GeoLabs SARL
    55 *
    66 * Permission is hereby granted, free of charge, to any person obtaining a copy
    … …  
    3131#include "response_print.h"
    3232#include <Python.h>
    33 #include "cgic.h"
    3433#ifdef WIN32
    3534#include <windows.h>
    3635#include <direct.h>
    3736#endif
     37#include "cgic.h"
    3838
    3939PyDictObject* PyDict_FromMaps(maps* t);

  • branches/prototype-v0/zoo-project/zoo-kernel/ulinet.c

    r897 r899  
    44 * Author : Gérald FENOY
    55 *
    6  * Copyright (c) 2008-2015 GeoLabs SARL
     6 * Copyright (c) 2008-2019 GeoLabs SARL
    77 *
    88 * Permission is hereby granted, free of charge, to any person obtaining a copy
    … …  
    3232#include <assert.h>
    3333#include <ctype.h>
     34#include "fcgi_stdio.h"
    3435
    3536/**

  • branches/prototype-v0/zoo-project/zoo-kernel/ulinet.h

    r896 r899  
    22 * Author : Gérald FENOY
    33 *
    4  *  Copyright 2008-2009 GeoLabs SARL. All rights reserved.
     4 *  Copyright 2008-2019 GeoLabs SARL. All rights reserved.
    55 *
    66 * Permission is hereby granted, free of charge, to any person obtaining a copy
    … …  
    2626#define _ULINET_H
    2727
    28 #include "fcgi_stdio.h"
    2928#include <stdlib.h>
    3029#include <fcntl.h>
Note: See TracChangeset for help on using the changeset viewer.

Download now !

Search

Context Navigation

Main 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