Tomotaka SUWA
t-suw****@users*****
2006年 2月 19日 (日) 16:09:12 JST
Index: AquaSKK/ChangeLog diff -u AquaSKK/ChangeLog:1.20.2.7 AquaSKK/ChangeLog:1.20.2.8 --- AquaSKK/ChangeLog:1.20.2.7 Sun Feb 19 14:20:54 2006 +++ AquaSKK/ChangeLog Sun Feb 19 16:09:11 2006 @@ -1,5 +1,8 @@ 2006-02-19 Tomotaka SUWA <t.suw****@mac*****> + * Package/scripts/postflight: ƒCƒ“ƒXƒg[ƒ‹Œã‚ÉAplist ‚̈Ús‚ðƒTƒ|[ + ƒgB + * skkserv.cpp: Ø’fŽž‚Ì peer ƒAƒhƒŒƒX•\Ž¦‚𳂵‚C³B * DictArrayController.*: NSTableView ‚̃f[ƒ^ƒ\[ƒXƒƒ\ƒbƒh‚ðŽÀ‘•B Index: AquaSKK/skkserv.cpp diff -u AquaSKK/skkserv.cpp:1.1.2.3 AquaSKK/skkserv.cpp:1.1.2.4 --- AquaSKK/skkserv.cpp:1.1.2.3 Sun Feb 19 14:20:54 2006 +++ AquaSKK/skkserv.cpp Sun Feb 19 16:09:11 2006 @@ -1,5 +1,5 @@ /* -*- c++ -*- - $Id: skkserv.cpp,v 1.1.2.3 2006/02/19 05:20:54 t-suwa Exp $ + $Id: skkserv.cpp,v 1.1.2.4 2006/02/19 07:09:11 t-suwa Exp $ MacOS X implementation of the SKK input method. @@ -27,7 +27,7 @@ #include "DictionarySet.h" #include "skkserv.h" -skkserv::skkserv() : pth_(0), server_(server_stream_socket()), port_(0), localonly_(true) { +skkserv::skkserv() : pth_(0), server_(server_stream_socket()), localonly_(true) { // empty } @@ -41,12 +41,9 @@ } bool skkserv::start(unsigned short port, bool localonly) { - port_ = port; localonly_ = localonly; - stop(); - - if(server_.bind(port_)) { + if(server_.bind(port)) { pthread_create(&pth_, NULL, skkserv::engine, this); return true; } @@ -59,11 +56,8 @@ pthread_cancel(pth_); pthread_join(pth_, NULL); pth_ = 0; - - if(server_) { - server_.close(); - } } + server_.close(); } void* skkserv::engine(void* param) { @@ -89,7 +83,7 @@ void* skkserv::session(void* param) { socket_stream sock((int)param); ip_address peer = ip_address::getpeername((int)param); - std::cerr << "AquaSKK: new skkserv session[" << peer << "]" << std::endl; + std::cerr << "AquaSKK: new session[" << peer << "]" << std::endl; unsigned char cmd; do { Index: AquaSKK/skkserv.h diff -u AquaSKK/skkserv.h:1.1.2.2 AquaSKK/skkserv.h:1.1.2.3 --- AquaSKK/skkserv.h:1.1.2.2 Sat Feb 18 02:33:33 2006 +++ AquaSKK/skkserv.h Sun Feb 19 16:09:11 2006 @@ -1,5 +1,5 @@ /* -*- c++ -*- - $Id: skkserv.h,v 1.1.2.2 2006/02/17 17:33:33 t-suwa Exp $ + $Id: skkserv.h,v 1.1.2.3 2006/02/19 07:09:11 t-suwa Exp $ MacOS X implementation of the SKK input method. @@ -27,7 +27,6 @@ class skkserv { pthread_t pth_; server_stream_socket server_; - unsigned short port_; bool localonly_; skkserv();
Fork