Changeset 2923


Ignore:
Timestamp:
Dec 29, 2006, 8:19:29 PM (18 years ago)
Author:
bird
Message:

cleanup in progress (party time)

Location:
trunk/libc/src/kNIX/os2
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • TabularUnified trunk/libc/src/kNIX/os2/b_dir.c

    r2915 r2923  
    4040static int dirWrite(__LIBC_PFH pFH, const void *pvBuf, size_t cbWrite, size_t *pcbWritten);
    4141static int dirSetSize(__LIBC_PFH pFH, off_t cbFile, int fZero);
     42static int dirSync(__LIBC_PFH pFH);
    4243static int dirDuplicate(__LIBC_PFH pFH, int *pfhNew);
    4344static int dirFileControl(__LIBC_PFH pFH, int iRequest, int iArg, int *prc);
    44 static int dirIOControl(__LIBC_PFH pFH, int iIOControl, int iArg, int *prc);
     45static int dirIOControl(__LIBC_PFH pFH, unsigned long ulIOControl, va_list va, int *prc);
    4546static int dirSeek(__LIBC_PFH pFH, off_t off, int iMethod, off_t *poffNew);
    4647static int dirSelect(int cFHs, struct fd_set *pRead, struct fd_set *pWrite, struct fd_set *pExcept, struct timeval *tv, int *prc);
    … …  
    6364    dirSeek,
    6465    dirSetSize,
     66    dirSync,
    6567    dirDuplicate,
    6668    dirFileControl,
    … …  
    7375
    7476
    75 /**
    76  * Close operation.
    77  *
    78  * @returns 0 on success.
    79  * @returns OS/2 error code or negated errno on failure.
    80  * @param   pFH         Pointer to the handle structure to operate on.
    81  */
     77/** @copydoc __LIBC_FHOPS::pfnClose */
    8278static int dirClose(__LIBC_PFH pFH)
    8379{
    … …  
    108104
    109105
    110 /**
    111  * Read operation.
    112  *
    113  * @returns 0 on success.
    114  * @returns OS/2 error code or negated errno on failure.
    115  * @param   pFH         Pointer to the handle structure to operate on.
    116  * @param   pvBuf       Pointer to the buffer to read into.
    117  * @param   cbRead      Number of bytes to read.
    118  * @param   pcbRead     Where to store the count of bytes actually read.
    119  */
     106/** @copydoc __LIBC_FHOPS::pfnRead */
    120107static int dirRead(__LIBC_PFH pFH, void *pvBuf, size_t cbRead, size_t *pcbRead)
    121108{
    … …  
    135122
    136123
    137 /** Write operation.
    138  * @returns 0 on success.
    139  * @returns OS/2 error code or negated errno on failure.
    140  * @param   pFH         Pointer to the handle structure to operate on.
    141  * @param   pvBuf       Pointer to the buffer which contains the data to write.
    142  * @param   cbWrite     Number of bytes to write.
    143  * @param   pcbWritten  Where to store the count of bytes actually written.
    144  */
     124/** @copydoc __LIBC_FHOPS::pfnWrite */
    145125static int dirWrite(__LIBC_PFH pFH, const void *pvBuf, size_t cbWrite, size_t *pcbWritten)
    146126{
    … …  
    150130
    151131
    152 /**
    153  * Sets the size of an open file.
    154  *
    155  * @returns 0 on success.
    156  * @returns Negative error code (errno.h) on failure.
    157  * @param   pFH     The file handle structure.
    158  * @param   cbFile  The new filesize.
    159  * @param   fZero   If set any new allocated file space should be initialized to zero.
    160  */
     132/** @copydoc __LIBC_FHOPS::pfnSetSize */
    161133static int dirSetSize(__LIBC_PFH pFH, off_t cbFile, int fZero)
    162134{
    … …  
    165137
    166138
    167 /** Duplicate handle operation.
    168  * @returns 0 on success, OS/2 error code on failure.
    169  * @param   pFH         Pointer to the handle structure to operate on.
    170  * @param   pfhNew      Where to store the duplicate filehandle.
    171  *                      The input value describe how the handle is to be
    172  *                      duplicated. If it's -1 a new handle is allocated.
    173  *                      Any other value will result in that value to be
    174  *                      used as handle. Any existing handle with that
    175  *                      value will be closed.
    176  */
     139/** @copydoc __LIBC_FHOPS::pfnSync */
     140static int dirSync(__LIBC_PFH pFH)
     141{
     142    LIBCLOG_ENTER("pFH=%p:{.fd=%d}\n", (void *)pFH, pFH->fh);
     143    LIBCLOG_RETURN_INT(0); /* fake bliss */
     144}
     145
     146
     147/** @copydoc __LIBC_FHOPS::pfnDuplicate */
    177148static int dirDuplicate(__LIBC_PFH pFH, int *pfhNew)
    178149{
    … …  
    182153
    183154
    184 /** File Control operation.
    185  * @returns 0 on success.
    186  * @returns OS/2 error code or negated errno on failure.
    187  * @param   pFH         Pointer to the handle structure to operate on.
    188  * @param   iRequest    Which file file descriptior request to perform.
    189  * @param   iArg        Argument which content is specific to each
    190  *                      iRequest operation.
    191  * @param   prc         Where to store the value which upon success is
    192  *                      returned to the caller.
    193  */
     155/** @copydoc __LIBC_FHOPS::pfnFileControl */
    194156static int dirFileControl(__LIBC_PFH pFH, int iRequest, int iArg, int *prc)
    195157{
    … …  
    199161
    200162
    201 /** I/O Control operation.
    202  * @returns 0 on success.
    203  * @returns OS/2 error code or negated errno on failure.
    204  * @param   pFH         Pointer to the handle structure to operate on.
    205  * @param   iIOControl  Which I/O control operation to perform.
    206  * @param   iArg        Argument which content is specific to each
    207  *                      iIOControl operation.
    208  * @param   prc         Where to store the value which upon success is
    209  *                      returned to the caller.
    210  */
    211 static int dirIOControl(__LIBC_PFH pFH, int iIOControl, int iArg, int *prc)
    212 {
    213     LIBCLOG_ENTER("pFH=%p:{.fd=%d} iIOControl=%d iArg=%d prc=%p\n", (void *)pFH, pFH->fh, iIOControl, iArg, (void *)prc);
     163/** @copydoc __LIBC_FHOPS::pfnIOControl */
     164static int dirIOControl(__LIBC_PFH pFH, unsigned long ulIOControl, va_list va, int *prc)
     165{
     166    LIBCLOG_ENTER("pFH=%p:{.fd=%d} ulIOControl=%#lx prc=%p\n", (void *)pFH, pFH->fh, ulIOControl, (void *)prc);
    214167    LIBCLOG_ERROR_RETURN_INT(-EOPNOTSUPP);
    215168}
    216169
    217170
    218 /** Seek to a new position in the 'file'.
    219  *
    220  * @returns 0 on success.
    221  * @returns OS/2 error code or negated errno on failure.
    222  * @param   pFH         Pointer to the handle structure to operate on.
    223  * @param   off         The offset to seek. The meaning depends on SEEK_.
    224  * @param   iMethod     The seek method, any of the SEEK_* macros.
    225  * @param   poffNew     Where to store the new file offset.
    226  */
     171/** @copydoc __LIBC_FHOPS::pfnSeek */
    227172static int dirSeek(__LIBC_PFH pFH, off_t off, int iMethod, off_t *poffNew)
    228173{
    … …  
    232177
    233178
    234 /** Select operation.
    235  * The select operation is only performed if all handles have the same
    236  * select routine (the main worker checks this).
    237  *
    238  * @returns 0 on success.
    239  * @returns OS/2 error code or negated errno on failure.
    240  * @param   cFHs        Range of handles to be tested.
    241  * @param   pRead       Bitmap for file handles to wait upon to become ready for reading.
    242  * @param   pWrite      Bitmap for file handles to wait upon to become ready for writing.
    243  * @param   pExcept     Bitmap of file handles to wait on (error) exceptions from.
    244  * @param   tv          Timeout value.
    245  * @param   prc         Where to store the value which upon success is
    246  *                      returned to the caller.
    247  */
     179/** @copydoc __LIBC_FHOPS::pfnSelect */
    248180static int dirSelect(int cFHs, struct fd_set *pRead, struct fd_set *pWrite, struct fd_set *pExcept, struct timeval *tv, int *prc)
    249181{
    … …  
    254186
    255187
    256 /** Fork notification - child context.
    257  * Only the __LIBC_FORK_OP_FORK_CHILD operation is forwarded atm.
    258  * If NULL it's assumed that no notifiction is needed.
    259  *
    260  * @returns 0 on success.
    261  * @returns OS/2 error code or negated errno on failure.
    262  * @param   pFH             Pointer to the handle structure to operate on.
    263  * @param   pForkHandle     The fork handle.
    264  * @param   enmOperation    The fork operation.
    265  */
     188/** @copydoc __LIBC_FHOPS::pfnForkChild */
    266189static int dirForkChild(__LIBC_PFH pFH, __LIBC_PFORKHANDLE pForkHandle, __LIBC_FORKOP enmOperation)
    267190{

  • TabularUnified trunk/libc/src/kNIX/os2/tcpipver.c

    r2916 r2923  
    134134static int TCPNAME(ops_Duplicate)(__LIBC_PFH pFH, int *pfhNew);
    135135static int TCPNAME(ops_FileControl)(__LIBC_PFH pFH, int iIOControl, int iArg, int *prc);
    136 static int TCPNAME(ops_IOControl)(__LIBC_PFH pFH, int iIOControl, int iArg, int *prc);
     136static int TCPNAME(ops_IOControl)(__LIBC_PFH pFH, unsigned long ulIOControl, va_list va, int *prc);
    137137static int TCPNAME(ops_Select)(int cFHs, struct fd_set *pRead, struct fd_set *pWrite, struct fd_set *pExcept, struct timeval *tv, int *prc);
    138138static int TCPNAME(ops_ForkChild)(struct __libc_FileHandle *pFH, __LIBC_PFORKHANDLE pForkHandle, __LIBC_FORKOP enmOperation);
    … …  
    176176    TCPNAME(ops_Read),
    177177    TCPNAME(ops_Write),
     178    NULL /* fixme! */,
    178179    NULL /* fixme! */,
    179180    NULL /* fixme! */,
    … …  
    434435
    435436
    436 /** I/O Control operation.
    437  * @returns 0 on success.
    438  * @returns OS/2 error code or negated errno on failure.
    439  * @param   pFH         Pointer to the handle structure to operate on.
    440  * @param   fh          It's associated filehandle.
    441  * @param   iIOControl  Which I/O control operation to perform.
    442  * @param   iArg        Argument which content is specific to each
    443  *                      iIOControl operation.
    444  * @param   prc         Where to store the value which upon success is
    445  *                      returned to the caller.
    446  */
    447 static int TCPNAME(ops_IOControl)(__LIBC_PFH pFH, int iIOControl, int iArg, int *prc)
    448 {
    449     LIBCLOG_ENTER("pFH=%p:{.iSocket=%d .fh=%d} iIOControl=%#x iArg=%#x prc=%p\n",
    450                   (void *)pFH, ((PLIBCSOCKETFH)pFH)->iSocket, pFH->fh, iIOControl, iArg, (void *)prc);
     437/** @copydoc __LIBC_FHOPS::pfnIOControl */
     438static int TCPNAME(ops_IOControl)(__LIBC_PFH pFH, unsigned long ulIOControl, va_list va, int *prc)
     439{
     440    LIBCLOG_ENTER("pFH=%p:{.iSocket=%d .fh=%d} ulIOControl=%#lx prc=%p\n",
     441                  (void *)pFH, ((PLIBCSOCKETFH)pFH)->iSocket, pFH->fh, ulIOControl, (void *)prc);
    451442    PLIBCSOCKETFH   pSocketFH = (PLIBCSOCKETFH)pFH;
    452     char           *pchArg = (char *)iArg;
     443    char           *pchArg = va_arg(va, char *);
    453444    int             rc;
    454445#ifndef TCPV40HDRS
    455     switch (__IOCLW(iIOControl))
     446    switch (__IOCLW(ulIOControl))
    456447    {
    457448        case __IOCLW(SIOSTATARP):
    … …  
    492483
    493484        default:
    494             rc = TCPNAME(imp_ioctl)(pSocketFH->iSocket, iIOControl, pchArg);
     485            rc = TCPNAME(imp_ioctl)(pSocketFH->iSocket, ulIOControl, pchArg);
    495486            break;
    496487    }
    … …  
    503494     * must determin. :-/
    504495     */
    505     switch (__IOCLW(iIOControl))
     496    switch (__IOCLW(ulIOControl))
    506497    {
    507498        case __IOCLW(FIONREAD):
    … …  
    703694    if (cb >= 0)
    704695    {
    705         switch (__IOCLW(iIOControl))
     696        switch (__IOCLW(ulIOControl))
    706697        {
    707698            case FIONBIO:
    708                 rc = TCPNAME(imp_os2_ioctl)(pSocketFH->iSocket, iIOControl, pchArg, cb);
     699                rc = TCPNAME(imp_os2_ioctl)(pSocketFH->iSocket, ulIOControl, pchArg, cb);
    709700                if (rc)
    710701                {
    … …  
    717708
    718709            default:
    719                 rc = TCPNAME(imp_os2_ioctl)(pSocketFH->iSocket, iIOControl, pchArg, cb);
     710                rc = TCPNAME(imp_os2_ioctl)(pSocketFH->iSocket, ulIOControl, pchArg, cb);
    720711                break;
    721712        }
Note: See TracChangeset for help on using the changeset viewer.