From 4acd4d7147ebbb3385b0abe4841f8a7ac7f23d7a Mon Sep 17 00:00:00 2001 From: Oleg Puchinin Date: Fri, 22 Aug 2008 17:44:39 +0700 Subject: [PATCH] "deprecated" warning fixed --- gclib2/Makefile | 8 ++++---- gclib2/cmake_install.cmake | 8 ++++---- gclib2/include/dlist.h | 2 +- gclib2/modules/Core/earray.cxx | 2 +- gclib2/modules/Misc/misc.cxx | 2 +- gclib2/modules/Net/DNS/dns.cxx | 2 +- gclib2/modules/Net/INET/dconnection.cxx | 2 +- gclib2/modules/Net/MMP/mmp_engine.cxx | 4 ++-- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/gclib2/Makefile b/gclib2/Makefile index 5a544cb..3c48eb4 100644 --- a/gclib2/Makefile +++ b/gclib2/Makefile @@ -39,10 +39,10 @@ RM = /usr/bin/cmake -E remove -f CMAKE_EDIT_COMMAND = /usr/bin/ccmake # The top-level source directory on which CMake was run. -CMAKE_SOURCE_DIR = /home/oleg/GIT/opsoft/gclib2 +CMAKE_SOURCE_DIR = /GIT/gclib2 # The top-level build directory on which CMake was run. -CMAKE_BINARY_DIR = /home/oleg/GIT/opsoft/gclib2 +CMAKE_BINARY_DIR = /GIT/gclib2 #============================================================================= # Targets provided globally by CMake. @@ -110,9 +110,9 @@ rebuild_cache/fast: rebuild_cache # The main all target all: cmake_check_build_system - $(CMAKE_COMMAND) -E cmake_progress_start /home/oleg/GIT/opsoft/gclib2/CMakeFiles /home/oleg/GIT/opsoft/gclib2/CMakeFiles/progress.make + $(CMAKE_COMMAND) -E cmake_progress_start /GIT/gclib2/CMakeFiles /GIT/gclib2/CMakeFiles/progress.make $(MAKE) -f CMakeFiles/Makefile2 all - $(CMAKE_COMMAND) -E cmake_progress_start /home/oleg/GIT/opsoft/gclib2/CMakeFiles 0 + $(CMAKE_COMMAND) -E cmake_progress_start /GIT/gclib2/CMakeFiles 0 .PHONY : all # The main clean target diff --git a/gclib2/cmake_install.cmake b/gclib2/cmake_install.cmake index 16ce213..595fb9b 100644 --- a/gclib2/cmake_install.cmake +++ b/gclib2/cmake_install.cmake @@ -1,4 +1,4 @@ -# Install script for directory: /home/oleg/GIT/opsoft/gclib2 +# Install script for directory: /GIT/gclib2 # Set the install prefix IF(NOT DEFINED CMAKE_INSTALL_PREFIX) @@ -33,7 +33,7 @@ IF(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE) ENDIF(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE) IF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" MATCHES "^(Unspecified)$") - FILE(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/lib" TYPE SHARED_LIBRARY FILES "/home/oleg/GIT/opsoft/gclib2/libgclib2.so") + FILE(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/lib" TYPE SHARED_LIBRARY FILES "/GIT/gclib2/libgclib2.so") IF(EXISTS "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/libgclib2.so") IF(CMAKE_INSTALL_DO_STRIP) EXECUTE_PROCESS(COMMAND "/usr/bin/strip" "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/libgclib2.so") @@ -47,7 +47,7 @@ ELSE(CMAKE_INSTALL_COMPONENT) SET(CMAKE_INSTALL_MANIFEST "install_manifest.txt") ENDIF(CMAKE_INSTALL_COMPONENT) -FILE(WRITE "/home/oleg/GIT/opsoft/gclib2/${CMAKE_INSTALL_MANIFEST}" "") +FILE(WRITE "/GIT/gclib2/${CMAKE_INSTALL_MANIFEST}" "") FOREACH(file ${CMAKE_INSTALL_MANIFEST_FILES}) - FILE(APPEND "/home/oleg/GIT/opsoft/gclib2/${CMAKE_INSTALL_MANIFEST}" "${file}\n") + FILE(APPEND "/GIT/gclib2/${CMAKE_INSTALL_MANIFEST}" "${file}\n") ENDFOREACH(file) diff --git a/gclib2/include/dlist.h b/gclib2/include/dlist.h index 05cc1d7..b4ba7c9 100644 --- a/gclib2/include/dlist.h +++ b/gclib2/include/dlist.h @@ -9,7 +9,7 @@ #include struct __dlist_entry_t; -typedef struct __dlist_entry_t { +struct __dlist_entry_t { char * data; __dlist_entry_t * next; __dlist_entry_t * prev; diff --git a/gclib2/modules/Core/earray.cxx b/gclib2/modules/Core/earray.cxx index 48607e0..79b51fe 100644 --- a/gclib2/modules/Core/earray.cxx +++ b/gclib2/modules/Core/earray.cxx @@ -164,7 +164,7 @@ char * EArray::join (char * mid, int *len_out) if (! mid) { mid_len = 0; - mid = ""; + mid = (char *) ""; } else mid_len = strlen (mid); diff --git a/gclib2/modules/Misc/misc.cxx b/gclib2/modules/Misc/misc.cxx index 64c4027..aa94d96 100755 --- a/gclib2/modules/Misc/misc.cxx +++ b/gclib2/modules/Misc/misc.cxx @@ -80,7 +80,7 @@ __export int Dterm_one_kick (int fd) /// Вернуть строку с версией библиотеки GCLib. __export char *Dversion () { - return "2.5"; + return (char *) "2.5"; } /*! \brief Заполнить буфер текущей датой и временем. diff --git a/gclib2/modules/Net/DNS/dns.cxx b/gclib2/modules/Net/DNS/dns.cxx index b8909ce..e238b1a 100755 --- a/gclib2/modules/Net/DNS/dns.cxx +++ b/gclib2/modules/Net/DNS/dns.cxx @@ -527,7 +527,7 @@ char * DNS::__name2dns (char *name, int *len) __dlist_entry_t * one; list = new List; - Dsplit (name, ".", list); + Dsplit (name, (char *) ".", list); d_buf = CNEW (char, 70); ptr = d_buf; diff --git a/gclib2/modules/Net/INET/dconnection.cxx b/gclib2/modules/Net/INET/dconnection.cxx index c033f54..058c248 100755 --- a/gclib2/modules/Net/INET/dconnection.cxx +++ b/gclib2/modules/Net/INET/dconnection.cxx @@ -537,7 +537,7 @@ List * DConnection::recvStrings () } pos[0] = '\0'; - Ret = split (m_buf, "\n"); + Ret = split (m_buf, (char *) "\n"); DROP (m_buf); return Ret; } diff --git a/gclib2/modules/Net/MMP/mmp_engine.cxx b/gclib2/modules/Net/MMP/mmp_engine.cxx index 7f2e887..29cb899 100755 --- a/gclib2/modules/Net/MMP/mmp_engine.cxx +++ b/gclib2/modules/Net/MMP/mmp_engine.cxx @@ -223,7 +223,7 @@ int MMP::login (char * login, char * pass) LPS (&ptr, login); LPS (&ptr, pass); UL (&ptr, STATUS_ONLINE); - LPS (&ptr, "Linux MMP client. (c) Oleg Puchinin graycardinalster@gmail.com"); + LPS (&ptr, (char *) "Linux MMP client. (c) Oleg Puchinin graycardinalster@gmail.com"); pkt = mk_pkt (MRIM_CS_LOGIN2, attach, ptr-attach); len = sizeof (mrim_hdr) + (ptr - attach); @@ -266,7 +266,7 @@ int MMP::sendMessage (char * to, char * message, bool multicast) UL (&ptr, 0); LPS (&ptr, to); LPS (&ptr, message); - LPS (&ptr, " "); + LPS (&ptr, (char *) " "); pkt = mk_pkt (MRIM_CS_MESSAGE, attach, ptr-attach); len = sizeof (mrim_hdr) + (ptr - attach); -- 2.11.4.GIT