diff options
| author | wtc%netscape.com <devnull@localhost> | 2000-09-01 06:02:03 +0000 |
|---|---|---|
| committer | wtc%netscape.com <devnull@localhost> | 2000-09-01 06:02:03 +0000 |
| commit | 67db9706337bad415fc6fcd96f227123b3e0f683 (patch) | |
| tree | 8bf62e43de10361800890aafbc3e837b44869baa | |
| parent | d4bad2fc6719b6f95ead31965b8d2191aff2e385 (diff) | |
| download | nspr-hg-67db9706337bad415fc6fcd96f227123b3e0f683.tar.gz | |
Bugzilla bug #40778: backed out the previous checkin. I convinced myself
that users shouldn't be accessing the 'reserved_fn_n' fields at all.
Modified files: prio.h, priometh.c, prlayer.c, prsocket.c, ptio.c
| -rw-r--r-- | pr/include/prio.h | 2 | ||||
| -rw-r--r-- | pr/src/io/priometh.c | 2 | ||||
| -rw-r--r-- | pr/src/io/prlayer.c | 2 | ||||
| -rw-r--r-- | pr/src/io/prsocket.c | 2 | ||||
| -rw-r--r-- | pr/src/pthreads/ptio.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/pr/include/prio.h b/pr/include/prio.h index 654f7bef..f60e1f1a 100644 --- a/pr/include/prio.h +++ b/pr/include/prio.h @@ -399,7 +399,7 @@ struct PRIOMethods { PRSetsocketoptionFN setsocketoption; /* Set value of specified option */ PRSendfileFN sendfile; /* Send a (partial) file with header/trailer*/ - PRConnectcontinueFN reserved_fn_4; /* the connectcontinue method */ + PRConnectcontinueFN connectcontinue; /* Continue a nonblocking connect */ PRReservedFN reserved_fn_3; /* reserved for future use */ PRReservedFN reserved_fn_2; /* reserved for future use */ diff --git a/pr/src/io/priometh.c b/pr/src/io/priometh.c index 0901f9ba..a2b8e9c8 100644 --- a/pr/src/io/priometh.c +++ b/pr/src/io/priometh.c @@ -185,7 +185,7 @@ PR_IMPLEMENT(PRStatus) PR_Connect( PR_IMPLEMENT(PRStatus) PR_ConnectContinue( PRFileDesc *fd, PRInt16 out_flags) { - return((fd->methods->reserved_fn_4)(fd,out_flags)); + return((fd->methods->connectcontinue)(fd,out_flags)); } PR_IMPLEMENT(PRFileDesc*) PR_Accept(PRFileDesc *fd, PRNetAddr *addr, diff --git a/pr/src/io/prlayer.c b/pr/src/io/prlayer.c index 3458740a..8cb5cda6 100644 --- a/pr/src/io/prlayer.c +++ b/pr/src/io/prlayer.c @@ -197,7 +197,7 @@ static PRStatus PR_CALLBACK pl_DefConnectcontinue ( PR_ASSERT(fd != NULL); PR_ASSERT(fd->lower != NULL); - return (fd->lower->methods->reserved_fn_4)(fd->lower, out_flags); + return (fd->lower->methods->connectcontinue)(fd->lower, out_flags); } static PRFileDesc* PR_CALLBACK pl_TopAccept ( diff --git a/pr/src/io/prsocket.c b/pr/src/io/prsocket.c index 76189505..7c4742a2 100644 --- a/pr/src/io/prsocket.c +++ b/pr/src/io/prsocket.c @@ -379,7 +379,7 @@ PR_IMPLEMENT(PRStatus) PR_GetConnectStatus(const PRPollDesc *pd) PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0); return PR_FAILURE; } - return bottom->methods->reserved_fn_4(bottom, pd->out_flags); + return bottom->methods->connectcontinue(bottom, pd->out_flags); } static PRFileDesc* PR_CALLBACK SocketAccept(PRFileDesc *fd, PRNetAddr *addr, diff --git a/pr/src/pthreads/ptio.c b/pr/src/pthreads/ptio.c index bd460ca8..c1b52a5d 100644 --- a/pr/src/pthreads/ptio.c +++ b/pr/src/pthreads/ptio.c @@ -1403,7 +1403,7 @@ PR_IMPLEMENT(PRStatus) PR_GetConnectStatus(const PRPollDesc *pd) PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0); return PR_FAILURE; } - return bottom->methods->reserved_fn_4(bottom, pd->out_flags); + return bottom->methods->connectcontinue(bottom, pd->out_flags); } /* PR_GetConnectStatus */ static PRFileDesc* pt_Accept( |