Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed Ungetch(void *, ...) to Ungetch(const void *, ...)

Browse Source 
Fixed some bug in gsocket


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3307 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Guilhem Lavaux
1999-08-06 18:23:49 +00:00
parent ea4f5235fc
commit 8f7173abc4
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/stream.h
View File

@@ -93,7 +93,7 @@ class WXDLLEXPORT wxInputStream: public wxStreamBase {
virtual size_t LastRead() { return wxStreamBase::m_lastcount; } virtual size_t LastRead() { return wxStreamBase::m_lastcount; }
// Ungetch // Ungetch
size_t Ungetch(void *buffer, size_t size); size_t Ungetch(const void *buffer, size_t size);
bool Ungetch(char c); bool Ungetch(char c);
// Operators // Operators

2
src/common/stream.cpp
View File

@@ -499,7 +499,7 @@ size_t wxInputStream::GetWBack(char *buf, size_t bsize)
return s_toget; return s_toget;
} }
size_t wxInputStream::Ungetch(void *buf, size_t bufsize) size_t wxInputStream::Ungetch(const void *buf, size_t bufsize)
{ {
char *ptrback; char *ptrback;

17
src/unix/gsocket.c
View File

@@ -263,6 +263,7 @@ GSocketError GSocket_SetServer(GSocket *sck)
/* We always have a stream here */ /* We always have a stream here */
sck->m_stream = TRUE; sck->m_stream = TRUE;
sck->m_server = TRUE;
/* Create the socket */ /* Create the socket */
sck->m_fd = socket(sck->m_local->m_realfamily, SOCK_STREAM, 0); sck->m_fd = socket(sck->m_local->m_realfamily, SOCK_STREAM, 0);
@@ -670,11 +671,11 @@ int _GSocket_Recv_Stream(GSocket *socket, char *buffer, int size)
DISABLE_TIMEOUT(socket); DISABLE_TIMEOUT(socket);
UNMASK_SIGNAL(); UNMASK_SIGNAL();
if (ret == -1 && errno != EAGAIN) { if (ret == -1 && errno != EWOULDBLOCK) {
socket->m_error = GSOCK_IOERR; socket->m_error = GSOCK_IOERR;
return -1; return -1;
} }
if (errno == EAGAIN) { if (errno == EWOULDBLOCK) {
socket->m_error = GSOCK_TRYAGAIN; socket->m_error = GSOCK_TRYAGAIN;
return -1; return -1;
} }
@@ -694,11 +695,11 @@ int _GSocket_Recv_Dgram(GSocket *socket, char *buffer, int size)
ret = recvfrom(socket->m_fd, buffer, size, 0, &from, &fromlen); ret = recvfrom(socket->m_fd, buffer, size, 0, &from, &fromlen);
DISABLE_TIMEOUT(socket); DISABLE_TIMEOUT(socket);
UNMASK_SIGNAL(); UNMASK_SIGNAL();
if (ret == -1 && errno != EAGAIN) { if (ret == -1 && errno != EWOULDBLOCK) {
socket->m_error = GSOCK_IOERR; socket->m_error = GSOCK_IOERR;
return -1; return -1;
} }
if (errno == EAGAIN) { if (errno == EWOULDBLOCK) {
socket->m_error = GSOCK_TRYAGAIN; socket->m_error = GSOCK_TRYAGAIN;
return -1; return -1;
} }
@@ -726,11 +727,11 @@ int _GSocket_Send_Stream(GSocket *socket, const char *buffer, int size)
ret = send(socket->m_fd, buffer, size, 0); ret = send(socket->m_fd, buffer, size, 0);
DISABLE_TIMEOUT(socket); DISABLE_TIMEOUT(socket);
UNMASK_SIGNAL(); UNMASK_SIGNAL();
if (ret == -1 && errno != EAGAIN) { if (ret == -1 && errno != EWOULDBLOCK) {
socket->m_error = GSOCK_IOERR; socket->m_error = GSOCK_IOERR;
return -1; return -1;
} }
if (errno == EAGAIN) { if (errno == EWOULDBLOCK) {
socket->m_error = GSOCK_TRYAGAIN; socket->m_error = GSOCK_TRYAGAIN;
return -1; return -1;
} }
@@ -760,11 +761,11 @@ int _GSocket_Send_Dgram(GSocket *socket, const char *buffer, int size)
/* Frees memory allocated from _GAddress_translate_to */ /* Frees memory allocated from _GAddress_translate_to */
free(addr); free(addr);
if (ret == -1 && errno != EAGAIN) { if (ret == -1 && errno != EWOULDBLOCK) {
socket->m_error = GSOCK_IOERR; socket->m_error = GSOCK_IOERR;
return -1; return -1;
} }
if (errno == EAGAIN) { if (errno == EWOULDBLOCK) {
socket->m_error = GSOCK_TRYAGAIN; socket->m_error = GSOCK_TRYAGAIN;
return -1; return -1;
} }