Changeset 9c3fa30 in rtems


Ignore:
Timestamp:
09/28/00 20:19:23 (22 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
2e61938
Parents:
527b508
Message:

2000-09-28 Joel Sherrill <joel@…>

  • libc/libio.h (rtems_filesystem_file_handlers_r, rtems_filesystem_operations_table): Added _h to all structure fields to indicate they are "handlers".
  • libc/libio_.h, libc/chdir.c, libc/chmod.c, libc/chown.c, libc/close.c, libc/eval.c, libc/fchdir.c, libc/fchmod.c, libc/fcntl.c, libc/fdatasync.c, libc/fstat.c, libc/fsync.c, libc/ftruncate.c, libc/getdents.c, libc/imfs_eval.c, libc/imfs_unlink.c, libc/ioctl.c, libc/ioman.c, libc/link.c, libc/lseek.c, libc/mknod.c, libc/mount.c, libc/open.c, libc/read.c, libc/readlink.c, libc/rmdir.c, libc/stat.c, libc/symlink.c, libc/unlink.c, libc/unmount.c, libc/utime.c, libc/write.c: Modified to reflect above name change.
Files:
107 edited

Legend:

Unmodified
Added
Removed
  • c/src/exec/include/rtems/libio_.h

    r527b508 r9c3fa30  
    169169#define rtems_filesystem_freenode( _node ) \
    170170  do { \
    171     if ( (_node)->ops->freenod ) \
    172       (*(_node)->ops->freenod)( (_node) ); \
     171    if ( (_node)->ops->freenod_h ) \
     172      (*(_node)->ops->freenod_h)( (_node) ); \
    173173  } while (0)
    174174
  • c/src/exec/libcsupport/include/rtems/libio.h

    r527b508 r9c3fa30  
    127127
    128128typedef struct {
    129     rtems_filesystem_open_t         open;
    130     rtems_filesystem_close_t        close;
    131     rtems_filesystem_read_t         read;
    132     rtems_filesystem_write_t        write;
    133     rtems_filesystem_ioctl_t        ioctl;
    134     rtems_filesystem_lseek_t        lseek;
    135     rtems_filesystem_fstat_t        fstat;
    136     rtems_filesystem_fchmod_t       fchmod;
    137     rtems_filesystem_ftruncate_t    ftruncate;
    138     rtems_filesystem_fpathconf_t    fpathconf;
    139     rtems_filesystem_fsync_t        fsync;
    140     rtems_filesystem_fdatasync_t    fdatasync;
    141     rtems_filesystem_fcntl_t        fcntl;
    142     rtems_filesystem_rmnod_t        rmnod;
     129    rtems_filesystem_open_t         open_h;
     130    rtems_filesystem_close_t        close_h;
     131    rtems_filesystem_read_t         read_h;
     132    rtems_filesystem_write_t        write_h;
     133    rtems_filesystem_ioctl_t        ioctl_h;
     134    rtems_filesystem_lseek_t        lseek_h;
     135    rtems_filesystem_fstat_t        fstat_h;
     136    rtems_filesystem_fchmod_t       fchmod_h;
     137    rtems_filesystem_ftruncate_t    ftruncate_h;
     138    rtems_filesystem_fpathconf_t    fpathconf_h;
     139    rtems_filesystem_fsync_t        fsync_h;
     140    rtems_filesystem_fdatasync_t    fdatasync_h;
     141    rtems_filesystem_fcntl_t        fcntl_h;
     142    rtems_filesystem_rmnod_t        rmnod_h;
    143143} rtems_filesystem_file_handlers_r;
    144144
     
    250250 */
    251251typedef struct {
    252     rtems_filesystem_evalpath_t      evalpath;
    253     rtems_filesystem_evalmake_t      evalformake;
    254     rtems_filesystem_link_t          link;
    255     rtems_filesystem_unlink_t        unlink;
    256     rtems_filesystem_node_type_t     node_type;
    257     rtems_filesystem_mknod_t         mknod;
    258     rtems_filesystem_chown_t         chown;
    259     rtems_filesystem_freenode_t      freenod;
    260     rtems_filesystem_mount_t         mount;
    261     rtems_filesystem_fsmount_me_t    fsmount_me;
    262     rtems_filesystem_unmount_t       unmount;
    263     rtems_filesystem_fsunmount_me_t  fsunmount_me;
    264     rtems_filesystem_utime_t         utime;
    265     rtems_filesystem_evaluate_link_t eval_link;
    266     rtems_filesystem_symlink_t       symlink;
    267     rtems_filesystem_readlink_t      readlink;
     252    rtems_filesystem_evalpath_t      evalpath_h;
     253    rtems_filesystem_evalmake_t      evalformake_h;
     254    rtems_filesystem_link_t          link_h;
     255    rtems_filesystem_unlink_t        unlink_h;
     256    rtems_filesystem_node_type_t     node_type_h;
     257    rtems_filesystem_mknod_t         mknod_h;
     258    rtems_filesystem_chown_t         chown_h;
     259    rtems_filesystem_freenode_t      freenod_h;
     260    rtems_filesystem_mount_t         mount_h;
     261    rtems_filesystem_fsmount_me_t    fsmount_me_h;
     262    rtems_filesystem_unmount_t       unmount_h;
     263    rtems_filesystem_fsunmount_me_t  fsunmount_me_h;
     264    rtems_filesystem_utime_t         utime_h;
     265    rtems_filesystem_evaluate_link_t eval_link_h;
     266    rtems_filesystem_symlink_t       symlink_h;
     267    rtems_filesystem_readlink_t      readlink_h;
    268268} rtems_filesystem_operations_table;
    269269
  • c/src/exec/libcsupport/include/rtems/libio_.h

    r527b508 r9c3fa30  
    169169#define rtems_filesystem_freenode( _node ) \
    170170  do { \
    171     if ( (_node)->ops->freenod ) \
    172       (*(_node)->ops->freenod)( (_node) ); \
     171    if ( (_node)->ops->freenod_h ) \
     172      (*(_node)->ops->freenod_h)( (_node) ); \
    173173  } while (0)
    174174
  • c/src/exec/libcsupport/src/chdir.c

    r527b508 r9c3fa30  
    3838   */
    3939
    40   if ( !loc.ops->node_type ) {
     40  if ( !loc.ops->node_type_h ) {
    4141    rtems_filesystem_freenode( &loc );
    4242    set_errno_and_return_minus_one( ENOTSUP );
    4343  }
    4444
    45   if (  (*loc.ops->node_type)( &loc ) != RTEMS_FILESYSTEM_DIRECTORY ) {
     45  if (  (*loc.ops->node_type_h)( &loc ) != RTEMS_FILESYSTEM_DIRECTORY ) {
    4646    rtems_filesystem_freenode( &loc );
    4747    set_errno_and_return_minus_one( ENOTDIR );
  • c/src/exec/libcsupport/src/chmod.c

    r527b508 r9c3fa30  
    3939  }
    4040
    41   if ( !loc.handlers->fchmod ){
     41  if ( !loc.handlers->fchmod_h ){
    4242    rtems_filesystem_freenode( &loc );
    4343    set_errno_and_return_minus_one( ENOTSUP );
    4444  }
    4545
    46   result = (*loc.handlers->fchmod)( &loc, mode );
     46  result = (*loc.handlers->fchmod_h)( &loc, mode );
    4747
    4848  rtems_filesystem_freenode( &loc );
  • c/src/exec/libcsupport/src/chown.c

    r527b508 r9c3fa30  
    3232    return -1;
    3333 
    34   if ( !loc.ops->chown ) {
     34  if ( !loc.ops->chown_h ) {
    3535    rtems_filesystem_freenode( &loc );
    3636    set_errno_and_return_minus_one( ENOTSUP );
    3737  }
    3838
    39   result = (*loc.ops->chown)( &loc, owner, group );
     39  result = (*loc.ops->chown_h)( &loc, owner, group );
    4040
    4141  rtems_filesystem_freenode( &loc );
  • c/src/exec/libcsupport/src/close.c

    r527b508 r9c3fa30  
    2626
    2727  rc = RTEMS_SUCCESSFUL;
    28   if ( iop->handlers->close )
    29     rc = (*iop->handlers->close)( iop );
     28  if ( iop->handlers->close_h )
     29    rc = (*iop->handlers->close_h)( iop );
    3030
    3131  rtems_libio_free( iop );
  • c/src/exec/libcsupport/src/eval.c

    r527b508 r9c3fa30  
    4444  rtems_filesystem_get_start_loc( pathname, &i, pathloc );
    4545
    46   if ( !pathloc->ops->evalpath )
     46  if ( !pathloc->ops->evalpath_h )
    4747    set_errno_and_return_minus_one( ENOTSUP );
    4848
    49   result = (*pathloc->ops->evalpath)( &pathname[i], flags, pathloc );
     49  result = (*pathloc->ops->evalpath_h)( &pathname[i], flags, pathloc );
    5050
    5151  /*
     
    5656  if ( (result == 0) && follow_link ) {
    5757
    58     if ( !pathloc->ops->node_type )
     58    if ( !pathloc->ops->node_type_h )
    5959      set_errno_and_return_minus_one( ENOTSUP );
    6060
    61     type = (*pathloc->ops->node_type)( pathloc );
     61    type = (*pathloc->ops->node_type_h)( pathloc );
    6262
    6363    if ( ( type == RTEMS_FILESYSTEM_HARD_LINK ) ||
    6464         ( type == RTEMS_FILESYSTEM_SYM_LINK ) ) {
    6565
    66         if ( !pathloc->ops->eval_link )
     66        if ( !pathloc->ops->eval_link_h )
    6767          set_errno_and_return_minus_one( ENOTSUP );
    6868
    69          result =  (*pathloc->ops->eval_link)( pathloc, flags );
     69         result =  (*pathloc->ops->eval_link_h)( pathloc, flags );
    7070 
    7171    }
  • c/src/exec/libcsupport/src/fchdir.c

    r527b508 r9c3fa30  
    4444  }
    4545
    46   if ( !iop->pathinfo.ops->node_type ) {
     46  if ( !iop->pathinfo.ops->node_type_h ) {
    4747    set_errno_and_return_minus_one( ENOTSUP );
    4848  }
    4949
    50   if (  (*iop->pathinfo.ops->node_type)( &iop->pathinfo ) !=
     50  if (  (*iop->pathinfo.ops->node_type_h)( &iop->pathinfo ) !=
    5151                                          RTEMS_FILESYSTEM_DIRECTORY ) {
    5252    set_errno_and_return_minus_one( ENOTDIR );
  • c/src/exec/libcsupport/src/fchmod.c

    r527b508 r9c3fa30  
    3737  rtems_libio_check_permissions( iop, LIBIO_FLAGS_WRITE );
    3838
    39   if ( !iop->handlers->fchmod )
     39  if ( !iop->handlers->fchmod_h )
    4040    set_errno_and_return_minus_one( ENOTSUP );
    4141
    42   return (*iop->pathinfo.handlers->fchmod)( &iop->pathinfo, mode );
     42  return (*iop->pathinfo.handlers->fchmod_h)( &iop->pathinfo, mode );
    4343}
    4444
  • c/src/exec/libcsupport/src/fcntl.c

    r527b508 r9c3fa30  
    133133  }
    134134  if (ret >= 0) {   
    135     if (iop->handlers->fcntl) {
    136       int err = (*iop->handlers->fcntl)( cmd, iop );
     135    if (iop->handlers->fcntl_h) {
     136      int err = (*iop->handlers->fcntl_h)( cmd, iop );
    137137      if (err) {
    138138        errno = err;
  • c/src/exec/libcsupport/src/fdatasync.c

    r527b508 r9c3fa30  
    3131   */
    3232
    33   if ( !iop->handlers->fdatasync )
     33  if ( !iop->handlers->fdatasync_h )
    3434    set_errno_and_return_minus_one( ENOTSUP );
    3535
    36   return (*iop->handlers->fdatasync)( iop );
     36  return (*iop->handlers->fdatasync_h)( iop );
    3737}
  • c/src/exec/libcsupport/src/fstat.c

    r527b508 r9c3fa30  
    4343    set_errno_and_return_minus_one( EBADF );
    4444
    45   if ( !iop->handlers->fstat )
     45  if ( !iop->handlers->fstat_h )
    4646    set_errno_and_return_minus_one( ENOTSUP );
    4747
     
    5252  memset( sbuf, 0, sizeof(struct stat) );
    5353
    54   return (*iop->handlers->fstat)( &iop->pathinfo, sbuf );
     54  return (*iop->handlers->fstat_h)( &iop->pathinfo, sbuf );
    5555}
    5656
  • c/src/exec/libcsupport/src/fsync.c

    r527b508 r9c3fa30  
    3434    set_errno_and_return_minus_one( EBADF );
    3535
    36   if ( !iop->handlers->fsync )
     36  if ( !iop->handlers->fsync_h )
    3737    set_errno_and_return_minus_one( ENOTSUP );
    3838
    39   return (*iop->handlers->fsync)( iop );
     39  return (*iop->handlers->fsync_h)( iop );
    4040}
  • c/src/exec/libcsupport/src/ftruncate.c

    r527b508 r9c3fa30  
    3838
    3939  loc = iop->pathinfo;
    40   if ( !loc.ops->node_type )
     40  if ( !loc.ops->node_type_h )
    4141    set_errno_and_return_minus_one( ENOTSUP );
    4242   
    43   if ( (*loc.ops->node_type)( &loc ) == RTEMS_FILESYSTEM_DIRECTORY )
     43  if ( (*loc.ops->node_type_h)( &loc ) == RTEMS_FILESYSTEM_DIRECTORY )
    4444    set_errno_and_return_minus_one( EISDIR );
    4545
    4646  rtems_libio_check_permissions( iop, LIBIO_FLAGS_WRITE );
    4747
    48   if ( !iop->handlers->ftruncate )
     48  if ( !iop->handlers->ftruncate_h )
    4949    set_errno_and_return_minus_one( ENOTSUP );
    5050
    51   return (*iop->handlers->ftruncate)( iop, length );
     51  return (*iop->handlers->ftruncate_h)( iop, length );
    5252}
    5353 
  • c/src/exec/libcsupport/src/getdents.c

    r527b508 r9c3fa30  
    4141   */
    4242  loc = iop->pathinfo;
    43   if ( !loc.ops->node_type )
     43  if ( !loc.ops->node_type_h )
    4444    set_errno_and_return_minus_one( ENOTSUP );
    4545   
    46   if ( (*loc.ops->node_type)( &loc ) != RTEMS_FILESYSTEM_DIRECTORY )
     46  if ( (*loc.ops->node_type_h)( &loc ) != RTEMS_FILESYSTEM_DIRECTORY )
    4747    set_errno_and_return_minus_one( ENOTDIR );
    4848
     
    5252   */
    5353
    54   if ( !iop->handlers->read )
     54  if ( !iop->handlers->read_h )
    5555    set_errno_and_return_minus_one( ENOTSUP );
    5656
    57   return (*iop->handlers->read)( iop, dd_buf, dd_len  );
     57  return (*iop->handlers->read_h)( iop, dd_buf, dd_len  );
    5858}
  • c/src/exec/libcsupport/src/ioctl.c

    r527b508 r9c3fa30  
    4545    set_errno_and_return_minus_one( EBADF );
    4646
    47   if ( !iop->handlers->ioctl )
     47  if ( !iop->handlers->ioctl_h )
    4848    set_errno_and_return_minus_one( ENOTSUP );
    4949
    50   rc = (*iop->handlers->ioctl)( iop, command, buffer );
     50  rc = (*iop->handlers->ioctl_h)( iop, command, buffer );
    5151
    5252  return rc;
  • c/src/exec/libcsupport/src/link.c

    r527b508 r9c3fa30  
    4343  rtems_filesystem_get_start_loc( new, &i, &parent_loc );
    4444
    45   if ( !parent_loc.ops->evalformake ) {
     45  if ( !parent_loc.ops->evalformake_h ) {
    4646    rtems_filesystem_freenode( &existing_loc );
    4747    rtems_filesystem_freenode( &parent_loc );
     
    4949  }
    5050
    51   result = (*parent_loc.ops->evalformake)( &new[i], &parent_loc, &name_start );
     51  result = (*parent_loc.ops->evalformake_h)( &new[i], &parent_loc, &name_start );
    5252  if ( result != 0 ) {
    5353    rtems_filesystem_freenode( &existing_loc );
     
    6767  }
    6868
    69   if ( !parent_loc.ops->link ) {
     69  if ( !parent_loc.ops->link_h ) {
    7070    rtems_filesystem_freenode( &existing_loc );
    7171    rtems_filesystem_freenode( &parent_loc );
     
    7373  }
    7474
    75   result = (*parent_loc.ops->link)( &existing_loc, &parent_loc, name_start );
     75  result = (*parent_loc.ops->link_h)( &existing_loc, &parent_loc, name_start );
    7676 
    7777  rtems_filesystem_freenode( &existing_loc );
  • c/src/exec/libcsupport/src/lseek.c

    r527b508 r9c3fa30  
    5050  }
    5151
    52   if ( !iop->handlers->lseek )
     52  if ( !iop->handlers->lseek_h )
    5353    set_errno_and_return_minus_one( ENOTSUP );
    5454
    55   return (*iop->handlers->lseek)( iop, offset, whence );
     55  return (*iop->handlers->lseek_h)( iop, offset, whence );
    5656}
    5757
  • c/src/exec/libcsupport/src/mknod.c

    r527b508 r9c3fa30  
    4444  rtems_filesystem_get_start_loc( pathname, &i, &temp_loc );
    4545
    46   if ( !temp_loc.ops->evalformake ) {
     46  if ( !temp_loc.ops->evalformake_h ) {
    4747    rtems_filesystem_freenode( &temp_loc );
    4848    set_errno_and_return_minus_one( ENOTSUP );
    4949  }
    5050
    51   result = (*temp_loc.ops->evalformake)(
     51  result = (*temp_loc.ops->evalformake_h)(
    5252    &pathname[i],
    5353    &temp_loc,
     
    5757    return -1;
    5858
    59   if ( !temp_loc.ops->mknod ) {
     59  if ( !temp_loc.ops->mknod_h ) {
    6060    rtems_filesystem_freenode( &temp_loc );
    6161    set_errno_and_return_minus_one( ENOTSUP );
    6262  }
    6363
    64   result =  (*temp_loc.ops->mknod)( name_start, mode, dev, &temp_loc );
     64  result =  (*temp_loc.ops->mknod_h)( name_start, mode, dev, &temp_loc );
    6565
    6666  rtems_filesystem_freenode( &temp_loc );
  • c/src/exec/libcsupport/src/mount.c

    r527b508 r9c3fa30  
    152152
    153153    loc_to_free = &loc;
    154     if ( loc.ops->node_type( &loc ) != RTEMS_FILESYSTEM_DIRECTORY ) {
     154    if ( loc.ops->node_type_h( &loc ) != RTEMS_FILESYSTEM_DIRECTORY ) {
    155155      errno = ENOTDIR;
    156156      goto cleanup_and_bail;
     
    184184     */
    185185
    186     if ( !loc.ops->mount ){
     186    if ( !loc.ops->mount_h ){
    187187      errno = ENOTSUP;
    188188      goto cleanup_and_bail;
    189189    }
    190190
    191     if ( loc.ops->mount( temp_mt_entry ) ) {
     191    if ( loc.ops->mount_h( temp_mt_entry ) ) {
    192192      goto cleanup_and_bail;
    193193    }
     
    210210  }
    211211
    212   if ( !fs_ops->fsmount_me ) {
     212  if ( !fs_ops->fsmount_me_h ) {
    213213    errno = ENOTSUP;
    214214    goto cleanup_and_bail;
    215215  }
    216216
    217   if ( fs_ops->fsmount_me( temp_mt_entry ) )
     217  if ( fs_ops->fsmount_me_h( temp_mt_entry ) )
    218218    goto cleanup_and_bail;
    219219
  • c/src/exec/libcsupport/src/open.c

    r527b508 r9c3fa30  
    149149  iop->pathinfo   = loc;
    150150
    151   if ( !iop->handlers->open ) {
     151  if ( !iop->handlers->open_h ) {
    152152    rc = ENOTSUP;
    153153    goto done;
    154154  }
    155155
    156   rc = (*iop->handlers->open)( iop, pathname, flags, mode );
     156  rc = (*iop->handlers->open_h)( iop, pathname, flags, mode );
    157157  if ( rc )
    158158    goto done;
  • c/src/exec/libcsupport/src/read.c

    r527b508 r9c3fa30  
    3434   */
    3535
    36   if ( !iop->handlers->read )
     36  if ( !iop->handlers->read_h )
    3737    set_errno_and_return_minus_one( ENOTSUP );
    3838
    39   rc = (*iop->handlers->read)( iop, buffer, count );
     39  rc = (*iop->handlers->read_h)( iop, buffer, count );
    4040
    4141  if ( rc > 0 )
  • c/src/exec/libcsupport/src/readlink.c

    r527b508 r9c3fa30  
    3030     return -1;
    3131 
    32   if ( !loc.ops->node_type ){
     32  if ( !loc.ops->node_type_h ){
    3333    rtems_filesystem_freenode( &loc );
    3434    set_errno_and_return_minus_one( ENOTSUP );
    3535  }
    3636
    37   if (  (*loc.ops->node_type)( &loc ) != RTEMS_FILESYSTEM_SYM_LINK ){
     37  if (  (*loc.ops->node_type_h)( &loc ) != RTEMS_FILESYSTEM_SYM_LINK ){
    3838    rtems_filesystem_freenode( &loc );
    3939    set_errno_and_return_minus_one( EINVAL );
    4040  }
    4141
    42   if ( !loc.ops->readlink ){
     42  if ( !loc.ops->readlink_h ){
    4343    rtems_filesystem_freenode( &loc );
    4444    set_errno_and_return_minus_one( ENOTSUP );
    4545  }
    4646
    47   result =  (*loc.ops->readlink)( &loc, buf, bufsize );
     47  result =  (*loc.ops->readlink_h)( &loc, buf, bufsize );
    4848
    4949  rtems_filesystem_freenode( &loc );
  • c/src/exec/libcsupport/src/rmdir.c

    r527b508 r9c3fa30  
    3939   */
    4040
    41   if ( !loc.ops->node_type ){
     41  if ( !loc.ops->node_type_h ){
    4242    rtems_filesystem_freenode( &loc );
    4343    set_errno_and_return_minus_one( ENOTSUP );
    4444  }
    4545
    46   if (  (*loc.ops->node_type)( &loc ) != RTEMS_FILESYSTEM_DIRECTORY ){
     46  if (  (*loc.ops->node_type_h)( &loc ) != RTEMS_FILESYSTEM_DIRECTORY ){
    4747    rtems_filesystem_freenode( &loc );
    4848    set_errno_and_return_minus_one( ENOTDIR );
     
    5353   */
    5454
    55   if ( !loc.handlers->rmnod ){
     55  if ( !loc.handlers->rmnod_h ){
    5656    rtems_filesystem_freenode( &loc );
    5757    set_errno_and_return_minus_one( ENOTSUP );
    5858  }
    5959
    60   result =  (*loc.handlers->rmnod)( &loc ); 
     60  result =  (*loc.handlers->rmnod_h)( &loc ); 
    6161
    6262  rtems_filesystem_freenode( &loc );
  • c/src/exec/libcsupport/src/stat.c

    r527b508 r9c3fa30  
    5858    return -1;
    5959 
    60   if ( !loc.handlers->fstat ){
     60  if ( !loc.handlers->fstat_h ){
    6161    rtems_filesystem_freenode( &loc );
    6262    set_errno_and_return_minus_one( ENOTSUP );
     
    7070  memset( buf, 0, sizeof(struct stat) );
    7171
    72   status =  (*loc.handlers->fstat)( &loc, buf );
     72  status =  (*loc.handlers->fstat_h)( &loc, buf );
    7373
    7474  rtems_filesystem_freenode( &loc );
  • c/src/exec/libcsupport/src/symlink.c

    r527b508 r9c3fa30  
    2525
    2626  rtems_filesystem_get_start_loc( sympath, &i, &loc );
    27   result = (*loc.ops->evalformake)( &sympath[i], &loc, &name_start );
     27  result = (*loc.ops->evalformake_h)( &sympath[i], &loc, &name_start );
    2828  if ( result != 0 )
    2929    return -1;
    3030
    31   if ( !loc.ops->symlink ) {
     31  if ( !loc.ops->symlink_h ) {
    3232    rtems_filesystem_freenode( &loc );
    3333    set_errno_and_return_minus_one( ENOTSUP );
    3434  }
    3535
    36   result = (*loc.ops->symlink)( &loc, actualpath, name_start);
     36  result = (*loc.ops->symlink_h)( &loc, actualpath, name_start);
    3737
    3838  rtems_filesystem_freenode( &loc );
  • c/src/exec/libcsupport/src/unlink.c

    r527b508 r9c3fa30  
    3131     return -1;
    3232 
    33   if ( !loc.ops->node_type ) {
     33  if ( !loc.ops->node_type_h ) {
    3434    rtems_filesystem_freenode( &loc );
    3535    set_errno_and_return_minus_one( ENOTSUP );
    3636  }
    3737
    38   if (  (*loc.ops->node_type)( &loc ) == RTEMS_FILESYSTEM_DIRECTORY ) {
     38  if (  (*loc.ops->node_type_h)( &loc ) == RTEMS_FILESYSTEM_DIRECTORY ) {
    3939    rtems_filesystem_freenode( &loc );
    4040    set_errno_and_return_minus_one( EISDIR );
    4141  }
    4242
    43   if ( !loc.ops->unlink ) {
     43  if ( !loc.ops->unlink_h ) {
    4444    rtems_filesystem_freenode( &loc );
    4545    set_errno_and_return_minus_one( ENOTSUP );
    4646  }
    4747
    48   result = (*loc.ops->unlink)( &loc );
     48  result = (*loc.ops->unlink_h)( &loc );
    4949
    5050  rtems_filesystem_freenode( &loc );
  • c/src/exec/libcsupport/src/unmount.c

    r527b508 r9c3fa30  
    106106   */
    107107
    108   if ((temp_mt_entry.mt_point_node.ops->unmount )( temp_loc.mt_entry ) != 0 ) {
     108  if ((temp_mt_entry.mt_point_node.ops->unmount_h )( temp_loc.mt_entry ) != 0 ) {
    109109    rtems_filesystem_freenode( &temp_loc );
    110110    return -1;
     
    115115   */
    116116
    117   if ((temp_mt_entry.mt_fs_root.ops->fsunmount_me )( temp_loc.mt_entry ) != 0){
     117  if ((temp_mt_entry.mt_fs_root.ops->fsunmount_me_h )( temp_loc.mt_entry ) != 0){
    118118    rtems_filesystem_freenode( &temp_loc );
    119119    return -1;
  • c/src/exec/libcsupport/src/utime.c

    r527b508 r9c3fa30  
    2929    return -1;
    3030
    31   if ( !temp_loc.ops->utime )
     31  if ( !temp_loc.ops->utime_h )
    3232    set_errno_and_return_minus_one( ENOTSUP );
    3333
    34   result = (*temp_loc.ops->utime)( &temp_loc, times->actime, times->modtime );
     34  result = (*temp_loc.ops->utime_h)( &temp_loc, times->actime, times->modtime );
    3535
    3636  rtems_filesystem_freenode( &temp_loc );
  • c/src/exec/libcsupport/src/write.c

    r527b508 r9c3fa30  
    4242   */
    4343
    44   if ( !iop->handlers->write )
     44  if ( !iop->handlers->write_h )
    4545    set_errno_and_return_minus_one( ENOTSUP );
    4646
    47   rc = (*iop->handlers->write)( iop, buffer, count );
     47  rc = (*iop->handlers->write_h)( iop, buffer, count );
    4848
    4949  if ( rc > 0 )
  • c/src/exec/libfs/src/imfs/imfs_eval.c

    r527b508 r9c3fa30  
    334334            newloc = pathloc->mt_entry->mt_point_node;
    335335            *pathloc = newloc;
    336             return (*pathloc->ops->evalformake)( &path[i-len], pathloc, name );
     336            return (*pathloc->ops->evalformake_h)( &path[i-len], pathloc, name );
    337337          }
    338338        } else {
     
    382382          newloc  = node->info.directory.mt_fs->mt_fs_root;
    383383          *pathloc = newloc;
    384           return (*pathloc->ops->evalformake)( &path[i-len], pathloc, name );
     384          return (*pathloc->ops->evalformake_h)( &path[i-len], pathloc, name );
    385385        }
    386386
     
    527527            newloc = pathloc->mt_entry->mt_point_node;
    528528            *pathloc = newloc;
    529             return (*pathloc->ops->evalpath)(&(pathname[i-len]),flags,pathloc);
     529            return (*pathloc->ops->evalpath_h)(&(pathname[i-len]),flags,pathloc);
    530530          }
    531531        } else {
     
    579579          newloc   = node->info.directory.mt_fs->mt_fs_root;
    580580          *pathloc = newloc;
    581           return (*pathloc->ops->evalpath)( &pathname[i-len], flags, pathloc );
     581          return (*pathloc->ops->evalpath_h)( &pathname[i-len], flags, pathloc );
    582582        }
    583583
  • c/src/exec/libfs/src/imfs/imfs_unlink.c

    r527b508 r9c3fa30  
    2626  IMFS_jnode_t                      *node;
    2727  rtems_filesystem_location_info_t   the_link;
    28   int                                result;
     28  int                                result = 0;
    2929 
    3030  node = loc->node_access;
     
    5757    IMFS_update_ctime( node->info.hard_link.link_node );
    5858    if ( node->info.hard_link.link_node->st_nlink < 1) {
    59       result = (*the_link.handlers->rmnod)( &the_link );
     59      result = (*the_link.handlers->rmnod_h)( &the_link );
    6060      if ( result != 0 )
    6161        return -1;
     
    6767   */
    6868
    69   result = (*loc->handlers->rmnod)( loc );
     69  result = (*loc->handlers->rmnod_h)( loc );
    7070
    7171  return result;
  • c/src/exec/libfs/src/imfs/ioman.c

    r527b508 r9c3fa30  
    8181  the_jnode = loc.node_access;
    8282
    83   if ( !loc.ops->node_type ) {
     83  if ( !loc.ops->node_type_h ) {
    8484    rtems_filesystem_freenode( &loc );
    8585    set_errno_and_return_minus_one( ENOTSUP );
    8686  }
    8787
    88   node_type = (*loc.ops->node_type)( &loc );
     88  node_type = (*loc.ops->node_type_h)( &loc );
    8989
    9090  if ( (result != 0) || node_type != RTEMS_FILESYSTEM_DEVICE ) {
  • c/src/lib/ChangeLog

    r527b508 r9c3fa30  
     1
     22000-09-28      Joel Sherrill <joel@OARcorp.com>
     3
     4        * libc/libio.h (rtems_filesystem_file_handlers_r,
     5        rtems_filesystem_operations_table): Added _h to all structure
     6        fields to indicate they are "handlers".
     7        * libc/libio_.h, libc/chdir.c, libc/chmod.c, libc/chown.c,
     8        libc/close.c, libc/eval.c, libc/fchdir.c, libc/fchmod.c,
     9        libc/fcntl.c, libc/fdatasync.c, libc/fstat.c, libc/fsync.c,
     10        libc/ftruncate.c, libc/getdents.c, libc/imfs_eval.c,
     11        libc/imfs_unlink.c, libc/ioctl.c, libc/ioman.c, libc/link.c,
     12        libc/lseek.c, libc/mknod.c, libc/mount.c, libc/open.c, libc/read.c,
     13        libc/readlink.c, libc/rmdir.c, libc/stat.c, libc/symlink.c,
     14        libc/unlink.c, libc/unmount.c, libc/utime.c, libc/write.c:
     15        Modified to reflect above name change.
    116
    2172000-09-22      Joel Sherrill <joel@OARcorp.com>
  • c/src/lib/include/rtems/libio.h

    r527b508 r9c3fa30  
    127127
    128128typedef struct {
    129     rtems_filesystem_open_t         open;
    130     rtems_filesystem_close_t        close;
    131     rtems_filesystem_read_t         read;
    132     rtems_filesystem_write_t        write;
    133     rtems_filesystem_ioctl_t        ioctl;
    134     rtems_filesystem_lseek_t        lseek;
    135     rtems_filesystem_fstat_t        fstat;
    136     rtems_filesystem_fchmod_t       fchmod;
    137     rtems_filesystem_ftruncate_t    ftruncate;
    138     rtems_filesystem_fpathconf_t    fpathconf;
    139     rtems_filesystem_fsync_t        fsync;
    140     rtems_filesystem_fdatasync_t    fdatasync;
    141     rtems_filesystem_fcntl_t        fcntl;
    142     rtems_filesystem_rmnod_t        rmnod;
     129    rtems_filesystem_open_t         open_h;
     130    rtems_filesystem_close_t        close_h;
     131    rtems_filesystem_read_t         read_h;
     132    rtems_filesystem_write_t        write_h;
     133    rtems_filesystem_ioctl_t        ioctl_h;
     134    rtems_filesystem_lseek_t        lseek_h;
     135    rtems_filesystem_fstat_t        fstat_h;
     136    rtems_filesystem_fchmod_t       fchmod_h;
     137    rtems_filesystem_ftruncate_t    ftruncate_h;
     138    rtems_filesystem_fpathconf_t    fpathconf_h;
     139    rtems_filesystem_fsync_t        fsync_h;
     140    rtems_filesystem_fdatasync_t    fdatasync_h;
     141    rtems_filesystem_fcntl_t        fcntl_h;
     142    rtems_filesystem_rmnod_t        rmnod_h;
    143143} rtems_filesystem_file_handlers_r;
    144144
     
    250250 */
    251251typedef struct {
    252     rtems_filesystem_evalpath_t      evalpath;
    253     rtems_filesystem_evalmake_t      evalformake;
    254     rtems_filesystem_link_t          link;
    255     rtems_filesystem_unlink_t        unlink;
    256     rtems_filesystem_node_type_t     node_type;
    257     rtems_filesystem_mknod_t         mknod;
    258     rtems_filesystem_chown_t         chown;
    259     rtems_filesystem_freenode_t      freenod;
    260     rtems_filesystem_mount_t         mount;
    261     rtems_filesystem_fsmount_me_t    fsmount_me;
    262     rtems_filesystem_unmount_t       unmount;
    263     rtems_filesystem_fsunmount_me_t  fsunmount_me;
    264     rtems_filesystem_utime_t         utime;
    265     rtems_filesystem_evaluate_link_t eval_link;
    266     rtems_filesystem_symlink_t       symlink;
    267     rtems_filesystem_readlink_t      readlink;
     252    rtems_filesystem_evalpath_t      evalpath_h;
     253    rtems_filesystem_evalmake_t      evalformake_h;
     254    rtems_filesystem_link_t          link_h;
     255    rtems_filesystem_unlink_t        unlink_h;
     256    rtems_filesystem_node_type_t     node_type_h;
     257    rtems_filesystem_mknod_t         mknod_h;
     258    rtems_filesystem_chown_t         chown_h;
     259    rtems_filesystem_freenode_t      freenod_h;
     260    rtems_filesystem_mount_t         mount_h;
     261    rtems_filesystem_fsmount_me_t    fsmount_me_h;
     262    rtems_filesystem_unmount_t       unmount_h;
     263    rtems_filesystem_fsunmount_me_t  fsunmount_me_h;
     264    rtems_filesystem_utime_t         utime_h;
     265    rtems_filesystem_evaluate_link_t eval_link_h;
     266    rtems_filesystem_symlink_t       symlink_h;
     267    rtems_filesystem_readlink_t      readlink_h;
    268268} rtems_filesystem_operations_table;
    269269
  • c/src/lib/include/rtems/libio_.h

    r527b508 r9c3fa30  
    169169#define rtems_filesystem_freenode( _node ) \
    170170  do { \
    171     if ( (_node)->ops->freenod ) \
    172       (*(_node)->ops->freenod)( (_node) ); \
     171    if ( (_node)->ops->freenod_h ) \
     172      (*(_node)->ops->freenod_h)( (_node) ); \
    173173  } while (0)
    174174
  • c/src/lib/libc/chdir.c

    r527b508 r9c3fa30  
    3838   */
    3939
    40   if ( !loc.ops->node_type ) {
     40  if ( !loc.ops->node_type_h ) {
    4141    rtems_filesystem_freenode( &loc );
    4242    set_errno_and_return_minus_one( ENOTSUP );
    4343  }
    4444
    45   if (  (*loc.ops->node_type)( &loc ) != RTEMS_FILESYSTEM_DIRECTORY ) {
     45  if (  (*loc.ops->node_type_h)( &loc ) != RTEMS_FILESYSTEM_DIRECTORY ) {
    4646    rtems_filesystem_freenode( &loc );
    4747    set_errno_and_return_minus_one( ENOTDIR );
  • c/src/lib/libc/chmod.c

    r527b508 r9c3fa30  
    3939  }
    4040
    41   if ( !loc.handlers->fchmod ){
     41  if ( !loc.handlers->fchmod_h ){
    4242    rtems_filesystem_freenode( &loc );
    4343    set_errno_and_return_minus_one( ENOTSUP );
    4444  }
    4545
    46   result = (*loc.handlers->fchmod)( &loc, mode );
     46  result = (*loc.handlers->fchmod_h)( &loc, mode );
    4747
    4848  rtems_filesystem_freenode( &loc );
  • c/src/lib/libc/chown.c

    r527b508 r9c3fa30  
    3232    return -1;
    3333 
    34   if ( !loc.ops->chown ) {
     34  if ( !loc.ops->chown_h ) {
    3535    rtems_filesystem_freenode( &loc );
    3636    set_errno_and_return_minus_one( ENOTSUP );
    3737  }
    3838
    39   result = (*loc.ops->chown)( &loc, owner, group );
     39  result = (*loc.ops->chown_h)( &loc, owner, group );
    4040
    4141  rtems_filesystem_freenode( &loc );
  • c/src/lib/libc/close.c

    r527b508 r9c3fa30  
    2626
    2727  rc = RTEMS_SUCCESSFUL;
    28   if ( iop->handlers->close )
    29     rc = (*iop->handlers->close)( iop );
     28  if ( iop->handlers->close_h )
     29    rc = (*iop->handlers->close_h)( iop );
    3030
    3131  rtems_libio_free( iop );
  • c/src/lib/libc/eval.c

    r527b508 r9c3fa30  
    4444  rtems_filesystem_get_start_loc( pathname, &i, pathloc );
    4545
    46   if ( !pathloc->ops->evalpath )
     46  if ( !pathloc->ops->evalpath_h )
    4747    set_errno_and_return_minus_one( ENOTSUP );
    4848
    49   result = (*pathloc->ops->evalpath)( &pathname[i], flags, pathloc );
     49  result = (*pathloc->ops->evalpath_h)( &pathname[i], flags, pathloc );
    5050
    5151  /*
     
    5656  if ( (result == 0) && follow_link ) {
    5757
    58     if ( !pathloc->ops->node_type )
     58    if ( !pathloc->ops->node_type_h )
    5959      set_errno_and_return_minus_one( ENOTSUP );
    6060
    61     type = (*pathloc->ops->node_type)( pathloc );
     61    type = (*pathloc->ops->node_type_h)( pathloc );
    6262
    6363    if ( ( type == RTEMS_FILESYSTEM_HARD_LINK ) ||
    6464         ( type == RTEMS_FILESYSTEM_SYM_LINK ) ) {
    6565
    66         if ( !pathloc->ops->eval_link )
     66        if ( !pathloc->ops->eval_link_h )
    6767          set_errno_and_return_minus_one( ENOTSUP );
    6868
    69          result =  (*pathloc->ops->eval_link)( pathloc, flags );
     69         result =  (*pathloc->ops->eval_link_h)( pathloc, flags );
    7070 
    7171    }
  • c/src/lib/libc/fchdir.c

    r527b508 r9c3fa30  
    4444  }
    4545
    46   if ( !iop->pathinfo.ops->node_type ) {
     46  if ( !iop->pathinfo.ops->node_type_h ) {
    4747    set_errno_and_return_minus_one( ENOTSUP );
    4848  }
    4949
    50   if (  (*iop->pathinfo.ops->node_type)( &iop->pathinfo ) !=
     50  if (  (*iop->pathinfo.ops->node_type_h)( &iop->pathinfo ) !=
    5151                                          RTEMS_FILESYSTEM_DIRECTORY ) {
    5252    set_errno_and_return_minus_one( ENOTDIR );
  • c/src/lib/libc/fchmod.c

    r527b508 r9c3fa30  
    3737  rtems_libio_check_permissions( iop, LIBIO_FLAGS_WRITE );
    3838
    39   if ( !iop->handlers->fchmod )
     39  if ( !iop->handlers->fchmod_h )
    4040    set_errno_and_return_minus_one( ENOTSUP );
    4141
    42   return (*iop->pathinfo.handlers->fchmod)( &iop->pathinfo, mode );
     42  return (*iop->pathinfo.handlers->fchmod_h)( &iop->pathinfo, mode );
    4343}
    4444
  • c/src/lib/libc/fcntl.c

    r527b508 r9c3fa30  
    133133  }
    134134  if (ret >= 0) {   
    135     if (iop->handlers->fcntl) {
    136       int err = (*iop->handlers->fcntl)( cmd, iop );
     135    if (iop->handlers->fcntl_h) {
     136      int err = (*iop->handlers->fcntl_h)( cmd, iop );
    137137      if (err) {
    138138        errno = err;
  • c/src/lib/libc/fdatasync.c

    r527b508 r9c3fa30  
    3131   */
    3232
    33   if ( !iop->handlers->fdatasync )
     33  if ( !iop->handlers->fdatasync_h )
    3434    set_errno_and_return_minus_one( ENOTSUP );
    3535
    36   return (*iop->handlers->fdatasync)( iop );
     36  return (*iop->handlers->fdatasync_h)( iop );
    3737}
  • c/src/lib/libc/fstat.c

    r527b508 r9c3fa30  
    4343    set_errno_and_return_minus_one( EBADF );
    4444
    45   if ( !iop->handlers->fstat )
     45  if ( !iop->handlers->fstat_h )
    4646    set_errno_and_return_minus_one( ENOTSUP );
    4747
     
    5252  memset( sbuf, 0, sizeof(struct stat) );
    5353
    54   return (*iop->handlers->fstat)( &iop->pathinfo, sbuf );
     54  return (*iop->handlers->fstat_h)( &iop->pathinfo, sbuf );
    5555}
    5656
  • c/src/lib/libc/fsync.c

    r527b508 r9c3fa30  
    3434    set_errno_and_return_minus_one( EBADF );
    3535
    36   if ( !iop->handlers->fsync )
     36  if ( !iop->handlers->fsync_h )
    3737    set_errno_and_return_minus_one( ENOTSUP );
    3838
    39   return (*iop->handlers->fsync)( iop );
     39  return (*iop->handlers->fsync_h)( iop );
    4040}
  • c/src/lib/libc/ftruncate.c

    r527b508 r9c3fa30  
    3838
    3939  loc = iop->pathinfo;
    40   if ( !loc.ops->node_type )
     40  if ( !loc.ops->node_type_h )
    4141    set_errno_and_return_minus_one( ENOTSUP );
    4242   
    43   if ( (*loc.ops->node_type)( &loc ) == RTEMS_FILESYSTEM_DIRECTORY )
     43  if ( (*loc.ops->node_type_h)( &loc ) == RTEMS_FILESYSTEM_DIRECTORY )
    4444    set_errno_and_return_minus_one( EISDIR );
    4545
    4646  rtems_libio_check_permissions( iop, LIBIO_FLAGS_WRITE );
    4747
    48   if ( !iop->handlers->ftruncate )
     48  if ( !iop->handlers->ftruncate_h )
    4949    set_errno_and_return_minus_one( ENOTSUP );
    5050
    51   return (*iop->handlers->ftruncate)( iop, length );
     51  return (*iop->handlers->ftruncate_h)( iop, length );
    5252}
    5353 
  • c/src/lib/libc/getdents.c

    r527b508 r9c3fa30  
    4141   */
    4242  loc = iop->pathinfo;
    43   if ( !loc.ops->node_type )
     43  if ( !loc.ops->node_type_h )
    4444    set_errno_and_return_minus_one( ENOTSUP );
    4545   
    46   if ( (*loc.ops->node_type)( &loc ) != RTEMS_FILESYSTEM_DIRECTORY )
     46  if ( (*loc.ops->node_type_h)( &loc ) != RTEMS_FILESYSTEM_DIRECTORY )
    4747    set_errno_and_return_minus_one( ENOTDIR );
    4848
     
    5252   */
    5353
    54   if ( !iop->handlers->read )
     54  if ( !iop->handlers->read_h )
    5555    set_errno_and_return_minus_one( ENOTSUP );
    5656
    57   return (*iop->handlers->read)( iop, dd_buf, dd_len  );
     57  return (*iop->handlers->read_h)( iop, dd_buf, dd_len  );
    5858}
  • c/src/lib/libc/imfs_eval.c

    r527b508 r9c3fa30  
    334334            newloc = pathloc->mt_entry->mt_point_node;
    335335            *pathloc = newloc;
    336             return (*pathloc->ops->evalformake)( &path[i-len], pathloc, name );
     336            return (*pathloc->ops->evalformake_h)( &path[i-len], pathloc, name );
    337337          }
    338338        } else {
     
    382382          newloc  = node->info.directory.mt_fs->mt_fs_root;
    383383          *pathloc = newloc;
    384           return (*pathloc->ops->evalformake)( &path[i-len], pathloc, name );
     384          return (*pathloc->ops->evalformake_h)( &path[i-len], pathloc, name );
    385385        }
    386386
     
    527527            newloc = pathloc->mt_entry->mt_point_node;
    528528            *pathloc = newloc;
    529             return (*pathloc->ops->evalpath)(&(pathname[i-len]),flags,pathloc);
     529            return (*pathloc->ops->evalpath_h)(&(pathname[i-len]),flags,pathloc);
    530530          }
    531531        } else {
     
    579579          newloc   = node->info.directory.mt_fs->mt_fs_root;
    580580          *pathloc = newloc;
    581           return (*pathloc->ops->evalpath)( &pathname[i-len], flags, pathloc );
     581          return (*pathloc->ops->evalpath_h)( &pathname[i-len], flags, pathloc );
    582582        }
    583583
  • c/src/lib/libc/imfs_unlink.c

    r527b508 r9c3fa30  
    2626  IMFS_jnode_t                      *node;
    2727  rtems_filesystem_location_info_t   the_link;
    28   int                                result;
     28  int                                result = 0;
    2929 
    3030  node = loc->node_access;
     
    5757    IMFS_update_ctime( node->info.hard_link.link_node );
    5858    if ( node->info.hard_link.link_node->st_nlink < 1) {
    59       result = (*the_link.handlers->rmnod)( &the_link );
     59      result = (*the_link.handlers->rmnod_h)( &the_link );
    6060      if ( result != 0 )
    6161        return -1;
     
    6767   */
    6868
    69   result = (*loc->handlers->rmnod)( loc );
     69  result = (*loc->handlers->rmnod_h)( loc );
    7070
    7171  return result;
  • c/src/lib/libc/ioctl.c

    r527b508 r9c3fa30  
    4545    set_errno_and_return_minus_one( EBADF );
    4646
    47   if ( !iop->handlers->ioctl )
     47  if ( !iop->handlers->ioctl_h )
    4848    set_errno_and_return_minus_one( ENOTSUP );
    4949
    50   rc = (*iop->handlers->ioctl)( iop, command, buffer );
     50  rc = (*iop->handlers->ioctl_h)( iop, command, buffer );
    5151
    5252  return rc;
  • c/src/lib/libc/ioman.c

    r527b508 r9c3fa30  
    8181  the_jnode = loc.node_access;
    8282
    83   if ( !loc.ops->node_type ) {
     83  if ( !loc.ops->node_type_h ) {
    8484    rtems_filesystem_freenode( &loc );
    8585    set_errno_and_return_minus_one( ENOTSUP );
    8686  }
    8787
    88   node_type = (*loc.ops->node_type)( &loc );
     88  node_type = (*loc.ops->node_type_h)( &loc );
    8989
    9090  if ( (result != 0) || node_type != RTEMS_FILESYSTEM_DEVICE ) {
  • c/src/lib/libc/libio.h

    r527b508 r9c3fa30  
    127127
    128128typedef struct {
    129     rtems_filesystem_open_t         open;
    130     rtems_filesystem_close_t        close;
    131     rtems_filesystem_read_t         read;
    132     rtems_filesystem_write_t        write;
    133     rtems_filesystem_ioctl_t        ioctl;
    134     rtems_filesystem_lseek_t        lseek;
    135     rtems_filesystem_fstat_t        fstat;
    136     rtems_filesystem_fchmod_t       fchmod;
    137     rtems_filesystem_ftruncate_t    ftruncate;
    138     rtems_filesystem_fpathconf_t    fpathconf;
    139     rtems_filesystem_fsync_t        fsync;
    140     rtems_filesystem_fdatasync_t    fdatasync;
    141     rtems_filesystem_fcntl_t        fcntl;
    142     rtems_filesystem_rmnod_t        rmnod;
     129    rtems_filesystem_open_t         open_h;
     130    rtems_filesystem_close_t        close_h;
     131    rtems_filesystem_read_t         read_h;
     132    rtems_filesystem_write_t        write_h;
     133    rtems_filesystem_ioctl_t        ioctl_h;
     134    rtems_filesystem_lseek_t        lseek_h;
     135    rtems_filesystem_fstat_t        fstat_h;
     136    rtems_filesystem_fchmod_t       fchmod_h;
     137    rtems_filesystem_ftruncate_t    ftruncate_h;
     138    rtems_filesystem_fpathconf_t    fpathconf_h;
     139    rtems_filesystem_fsync_t        fsync_h;
     140    rtems_filesystem_fdatasync_t    fdatasync_h;
     141    rtems_filesystem_fcntl_t        fcntl_h;
     142    rtems_filesystem_rmnod_t        rmnod_h;
    143143} rtems_filesystem_file_handlers_r;
    144144
     
    250250 */
    251251typedef struct {
    252     rtems_filesystem_evalpath_t      evalpath;
    253     rtems_filesystem_evalmake_t      evalformake;
    254     rtems_filesystem_link_t          link;
    255     rtems_filesystem_unlink_t        unlink;
    256     rtems_filesystem_node_type_t     node_type;
    257     rtems_filesystem_mknod_t         mknod;
    258     rtems_filesystem_chown_t         chown;
    259     rtems_filesystem_freenode_t      freenod;
    260     rtems_filesystem_mount_t         mount;
    261     rtems_filesystem_fsmount_me_t    fsmount_me;
    262     rtems_filesystem_unmount_t       unmount;
    263     rtems_filesystem_fsunmount_me_t  fsunmount_me;
    264     rtems_filesystem_utime_t         utime;
    265     rtems_filesystem_evaluate_link_t eval_link;
    266     rtems_filesystem_symlink_t       symlink;
    267     rtems_filesystem_readlink_t      readlink;
     252    rtems_filesystem_evalpath_t      evalpath_h;
     253    rtems_filesystem_evalmake_t      evalformake_h;
     254    rtems_filesystem_link_t          link_h;
     255    rtems_filesystem_unlink_t        unlink_h;
     256    rtems_filesystem_node_type_t     node_type_h;
     257    rtems_filesystem_mknod_t         mknod_h;
     258    rtems_filesystem_chown_t         chown_h;
     259    rtems_filesystem_freenode_t      freenod_h;
     260    rtems_filesystem_mount_t         mount_h;
     261    rtems_filesystem_fsmount_me_t    fsmount_me_h;
     262    rtems_filesystem_unmount_t       unmount_h;
     263    rtems_filesystem_fsunmount_me_t  fsunmount_me_h;
     264    rtems_filesystem_utime_t         utime_h;
     265    rtems_filesystem_evaluate_link_t eval_link_h;
     266    rtems_filesystem_symlink_t       symlink_h;
     267    rtems_filesystem_readlink_t      readlink_h;
    268268} rtems_filesystem_operations_table;
    269269
  • c/src/lib/libc/libio_.h

    r527b508 r9c3fa30  
    169169#define rtems_filesystem_freenode( _node ) \
    170170  do { \
    171     if ( (_node)->ops->freenod ) \
    172       (*(_node)->ops->freenod)( (_node) ); \
     171    if ( (_node)->ops->freenod_h ) \
     172      (*(_node)->ops->freenod_h)( (_node) ); \
    173173  } while (0)
    174174
  • c/src/lib/libc/link.c

    r527b508 r9c3fa30  
    4343  rtems_filesystem_get_start_loc( new, &i, &parent_loc );
    4444
    45   if ( !parent_loc.ops->evalformake ) {
     45  if ( !parent_loc.ops->evalformake_h ) {
    4646    rtems_filesystem_freenode( &existing_loc );
    4747    rtems_filesystem_freenode( &parent_loc );
     
    4949  }
    5050
    51   result = (*parent_loc.ops->evalformake)( &new[i], &parent_loc, &name_start );
     51  result = (*parent_loc.ops->evalformake_h)( &new[i], &parent_loc, &name_start );
    5252  if ( result != 0 ) {
    5353    rtems_filesystem_freenode( &existing_loc );
     
    6767  }
    6868
    69   if ( !parent_loc.ops->link ) {
     69  if ( !parent_loc.ops->link_h ) {
    7070    rtems_filesystem_freenode( &existing_loc );
    7171    rtems_filesystem_freenode( &parent_loc );
     
    7373  }
    7474
    75   result = (*parent_loc.ops->link)( &existing_loc, &parent_loc, name_start );
     75  result = (*parent_loc.ops->link_h)( &existing_loc, &parent_loc, name_start );
    7676 
    7777  rtems_filesystem_freenode( &existing_loc );
  • c/src/lib/libc/lseek.c

    r527b508 r9c3fa30  
    5050  }
    5151
    52   if ( !iop->handlers->lseek )
     52  if ( !iop->handlers->lseek_h )
    5353    set_errno_and_return_minus_one( ENOTSUP );
    5454
    55   return (*iop->handlers->lseek)( iop, offset, whence );
     55  return (*iop->handlers->lseek_h)( iop, offset, whence );
    5656}
    5757
  • c/src/lib/libc/mknod.c

    r527b508 r9c3fa30  
    4444  rtems_filesystem_get_start_loc( pathname, &i, &temp_loc );
    4545
    46   if ( !temp_loc.ops->evalformake ) {
     46  if ( !temp_loc.ops->evalformake_h ) {
    4747    rtems_filesystem_freenode( &temp_loc );
    4848    set_errno_and_return_minus_one( ENOTSUP );
    4949  }
    5050
    51   result = (*temp_loc.ops->evalformake)(
     51  result = (*temp_loc.ops->evalformake_h)(
    5252    &pathname[i],
    5353    &temp_loc,
     
    5757    return -1;
    5858
    59   if ( !temp_loc.ops->mknod ) {
     59  if ( !temp_loc.ops->mknod_h ) {
    6060    rtems_filesystem_freenode( &temp_loc );
    6161    set_errno_and_return_minus_one( ENOTSUP );
    6262  }
    6363
    64   result =  (*temp_loc.ops->mknod)( name_start, mode, dev, &temp_loc );
     64  result =  (*temp_loc.ops->mknod_h)( name_start, mode, dev, &temp_loc );
    6565
    6666  rtems_filesystem_freenode( &temp_loc );
  • c/src/lib/libc/mount.c

    r527b508 r9c3fa30  
    152152
    153153    loc_to_free = &loc;
    154     if ( loc.ops->node_type( &loc ) != RTEMS_FILESYSTEM_DIRECTORY ) {
     154    if ( loc.ops->node_type_h( &loc ) != RTEMS_FILESYSTEM_DIRECTORY ) {
    155155      errno = ENOTDIR;
    156156      goto cleanup_and_bail;
     
    184184     */
    185185
    186     if ( !loc.ops->mount ){
     186    if ( !loc.ops->mount_h ){
    187187      errno = ENOTSUP;
    188188      goto cleanup_and_bail;
    189189    }
    190190
    191     if ( loc.ops->mount( temp_mt_entry ) ) {
     191    if ( loc.ops->mount_h( temp_mt_entry ) ) {
    192192      goto cleanup_and_bail;
    193193    }
     
    210210  }
    211211
    212   if ( !fs_ops->fsmount_me ) {
     212  if ( !fs_ops->fsmount_me_h ) {
    213213    errno = ENOTSUP;
    214214    goto cleanup_and_bail;
    215215  }
    216216
    217   if ( fs_ops->fsmount_me( temp_mt_entry ) )
     217  if ( fs_ops->fsmount_me_h( temp_mt_entry ) )
    218218    goto cleanup_and_bail;
    219219
  • c/src/lib/libc/open.c

    r527b508 r9c3fa30  
    149149  iop->pathinfo   = loc;
    150150
    151   if ( !iop->handlers->open ) {
     151  if ( !iop->handlers->open_h ) {
    152152    rc = ENOTSUP;
    153153    goto done;
    154154  }
    155155
    156   rc = (*iop->handlers->open)( iop, pathname, flags, mode );
     156  rc = (*iop->handlers->open_h)( iop, pathname, flags, mode );
    157157  if ( rc )
    158158    goto done;
  • c/src/lib/libc/read.c

    r527b508 r9c3fa30  
    3434   */
    3535
    36   if ( !iop->handlers->read )
     36  if ( !iop->handlers->read_h )
    3737    set_errno_and_return_minus_one( ENOTSUP );
    3838
    39   rc = (*iop->handlers->read)( iop, buffer, count );
     39  rc = (*iop->handlers->read_h)( iop, buffer, count );
    4040
    4141  if ( rc > 0 )
  • c/src/lib/libc/readlink.c

    r527b508 r9c3fa30  
    3030     return -1;
    3131 
    32   if ( !loc.ops->node_type ){
     32  if ( !loc.ops->node_type_h ){
    3333    rtems_filesystem_freenode( &loc );
    3434    set_errno_and_return_minus_one( ENOTSUP );
    3535  }
    3636
    37   if (  (*loc.ops->node_type)( &loc ) != RTEMS_FILESYSTEM_SYM_LINK ){
     37  if (  (*loc.ops->node_type_h)( &loc ) != RTEMS_FILESYSTEM_SYM_LINK ){
    3838    rtems_filesystem_freenode( &loc );
    3939    set_errno_and_return_minus_one( EINVAL );
    4040  }
    4141
    42   if ( !loc.ops->readlink ){
     42  if ( !loc.ops->readlink_h ){
    4343    rtems_filesystem_freenode( &loc );
    4444    set_errno_and_return_minus_one( ENOTSUP );
    4545  }
    4646
    47   result =  (*loc.ops->readlink)( &loc, buf, bufsize );
     47  result =  (*loc.ops->readlink_h)( &loc, buf, bufsize );
    4848
    4949  rtems_filesystem_freenode( &loc );
  • c/src/lib/libc/rmdir.c

    r527b508 r9c3fa30  
    3939   */
    4040
    41   if ( !loc.ops->node_type ){
     41  if ( !loc.ops->node_type_h ){
    4242    rtems_filesystem_freenode( &loc );
    4343    set_errno_and_return_minus_one( ENOTSUP );
    4444  }
    4545
    46   if (  (*loc.ops->node_type)( &loc ) != RTEMS_FILESYSTEM_DIRECTORY ){
     46  if (  (*loc.ops->node_type_h)( &loc ) != RTEMS_FILESYSTEM_DIRECTORY ){
    4747    rtems_filesystem_freenode( &loc );
    4848    set_errno_and_return_minus_one( ENOTDIR );
     
    5353   */
    5454
    55   if ( !loc.handlers->rmnod ){
     55  if ( !loc.handlers->rmnod_h ){
    5656    rtems_filesystem_freenode( &loc );
    5757    set_errno_and_return_minus_one( ENOTSUP );
    5858  }
    5959
    60   result =  (*loc.handlers->rmnod)( &loc ); 
     60  result =  (*loc.handlers->rmnod_h)( &loc ); 
    6161
    6262  rtems_filesystem_freenode( &loc );
  • c/src/lib/libc/stat.c

    r527b508 r9c3fa30  
    5858    return -1;
    5959 
    60   if ( !loc.handlers->fstat ){
     60  if ( !loc.handlers->fstat_h ){
    6161    rtems_filesystem_freenode( &loc );
    6262    set_errno_and_return_minus_one( ENOTSUP );
     
    7070  memset( buf, 0, sizeof(struct stat) );
    7171
    72   status =  (*loc.handlers->fstat)( &loc, buf );
     72  status =  (*loc.handlers->fstat_h)( &loc, buf );
    7373
    7474  rtems_filesystem_freenode( &loc );
  • c/src/lib/libc/symlink.c

    r527b508 r9c3fa30  
    2525
    2626  rtems_filesystem_get_start_loc( sympath, &i, &loc );
    27   result = (*loc.ops->evalformake)( &sympath[i], &loc, &name_start );
     27  result = (*loc.ops->evalformake_h)( &sympath[i], &loc, &name_start );
    2828  if ( result != 0 )
    2929    return -1;
    3030
    31   if ( !loc.ops->symlink ) {
     31  if ( !loc.ops->symlink_h ) {
    3232    rtems_filesystem_freenode( &loc );
    3333    set_errno_and_return_minus_one( ENOTSUP );
    3434  }
    3535
    36   result = (*loc.ops->symlink)( &loc, actualpath, name_start);
     36  result = (*loc.ops->symlink_h)( &loc, actualpath, name_start);
    3737
    3838  rtems_filesystem_freenode( &loc );
  • c/src/lib/libc/unlink.c

    r527b508 r9c3fa30  
    3131     return -1;
    3232 
    33   if ( !loc.ops->node_type ) {
     33  if ( !loc.ops->node_type_h ) {
    3434    rtems_filesystem_freenode( &loc );
    3535    set_errno_and_return_minus_one( ENOTSUP );
    3636  }
    3737
    38   if (  (*loc.ops->node_type)( &loc ) == RTEMS_FILESYSTEM_DIRECTORY ) {
     38  if (  (*loc.ops->node_type_h)( &loc ) == RTEMS_FILESYSTEM_DIRECTORY ) {
    3939    rtems_filesystem_freenode( &loc );
    4040    set_errno_and_return_minus_one( EISDIR );
    4141  }
    4242
    43   if ( !loc.ops->unlink ) {
     43  if ( !loc.ops->unlink_h ) {
    4444    rtems_filesystem_freenode( &loc );
    4545    set_errno_and_return_minus_one( ENOTSUP );
    4646  }
    4747
    48   result = (*loc.ops->unlink)( &loc );
     48  result = (*loc.ops->unlink_h)( &loc );
    4949
    5050  rtems_filesystem_freenode( &loc );
  • c/src/lib/libc/unmount.c

    r527b508 r9c3fa30  
    106106   */
    107107
    108   if ((temp_mt_entry.mt_point_node.ops->unmount )( temp_loc.mt_entry ) != 0 ) {
     108  if ((temp_mt_entry.mt_point_node.ops->unmount_h )( temp_loc.mt_entry ) != 0 ) {
    109109    rtems_filesystem_freenode( &temp_loc );
    110110    return -1;
     
    115115   */
    116116
    117   if ((temp_mt_entry.mt_fs_root.ops->fsunmount_me )( temp_loc.mt_entry ) != 0){
     117  if ((temp_mt_entry.mt_fs_root.ops->fsunmount_me_h )( temp_loc.mt_entry ) != 0){
    118118    rtems_filesystem_freenode( &temp_loc );
    119119    return -1;
  • c/src/lib/libc/utime.c

    r527b508 r9c3fa30  
    2929    return -1;
    3030
    31   if ( !temp_loc.ops->utime )
     31  if ( !temp_loc.ops->utime_h )
    3232    set_errno_and_return_minus_one( ENOTSUP );
    3333
    34   result = (*temp_loc.ops->utime)( &temp_loc, times->actime, times->modtime );
     34  result = (*temp_loc.ops->utime_h)( &temp_loc, times->actime, times->modtime );
    3535
    3636  rtems_filesystem_freenode( &temp_loc );
  • c/src/lib/libc/write.c

    r527b508 r9c3fa30  
    4242   */
    4343
    44   if ( !iop->handlers->write )
     44  if ( !iop->handlers->write_h )
    4545    set_errno_and_return_minus_one( ENOTSUP );
    4646
    47   rc = (*iop->handlers->write)( iop, buffer, count );
     47  rc = (*iop->handlers->write_h)( iop, buffer, count );
    4848
    4949  if ( rc > 0 )
  • c/src/libfs/src/imfs/imfs_eval.c

    r527b508 r9c3fa30  
    334334            newloc = pathloc->mt_entry->mt_point_node;
    335335            *pathloc = newloc;
    336             return (*pathloc->ops->evalformake)( &path[i-len], pathloc, name );
     336            return (*pathloc->ops->evalformake_h)( &path[i-len], pathloc, name );
    337337          }
    338338        } else {
     
    382382          newloc  = node->info.directory.mt_fs->mt_fs_root;
    383383          *pathloc = newloc;
    384           return (*pathloc->ops->evalformake)( &path[i-len], pathloc, name );
     384          return (*pathloc->ops->evalformake_h)( &path[i-len], pathloc, name );
    385385        }
    386386
     
    527527            newloc = pathloc->mt_entry->mt_point_node;
    528528            *pathloc = newloc;
    529             return (*pathloc->ops->evalpath)(&(pathname[i-len]),flags,pathloc);
     529            return (*pathloc->ops->evalpath_h)(&(pathname[i-len]),flags,pathloc);
    530530          }
    531531        } else {
     
    579579          newloc   = node->info.directory.mt_fs->mt_fs_root;
    580580          *pathloc = newloc;
    581           return (*pathloc->ops->evalpath)( &pathname[i-len], flags, pathloc );
     581          return (*pathloc->ops->evalpath_h)( &pathname[i-len], flags, pathloc );
    582582        }
    583583
  • c/src/libfs/src/imfs/imfs_unlink.c

    r527b508 r9c3fa30  
    2626  IMFS_jnode_t                      *node;
    2727  rtems_filesystem_location_info_t   the_link;
    28   int                                result;
     28  int                                result = 0;
    2929 
    3030  node = loc->node_access;
     
    5757    IMFS_update_ctime( node->info.hard_link.link_node );
    5858    if ( node->info.hard_link.link_node->st_nlink < 1) {
    59       result = (*the_link.handlers->rmnod)( &the_link );
     59      result = (*the_link.handlers->rmnod_h)( &the_link );
    6060      if ( result != 0 )
    6161        return -1;
     
    6767   */
    6868
    69   result = (*loc->handlers->rmnod)( loc );
     69  result = (*loc->handlers->rmnod_h)( loc );
    7070
    7171  return result;
  • c/src/libfs/src/imfs/ioman.c

    r527b508 r9c3fa30  
    8181  the_jnode = loc.node_access;
    8282
    83   if ( !loc.ops->node_type ) {
     83  if ( !loc.ops->node_type_h ) {
    8484    rtems_filesystem_freenode( &loc );
    8585    set_errno_and_return_minus_one( ENOTSUP );
    8686  }
    8787
    88   node_type = (*loc.ops->node_type)( &loc );
     88  node_type = (*loc.ops->node_type_h)( &loc );
    8989
    9090  if ( (result != 0) || node_type != RTEMS_FILESYSTEM_DEVICE ) {
  • cpukit/include/rtems/libio_.h

    r527b508 r9c3fa30  
    169169#define rtems_filesystem_freenode( _node ) \
    170170  do { \
    171     if ( (_node)->ops->freenod ) \
    172       (*(_node)->ops->freenod)( (_node) ); \
     171    if ( (_node)->ops->freenod_h ) \
     172      (*(_node)->ops->freenod_h)( (_node) ); \
    173173  } while (0)
    174174
  • cpukit/libcsupport/include/rtems/libio.h

    r527b508 r9c3fa30  
    127127
    128128typedef struct {
    129     rtems_filesystem_open_t         open;
    130     rtems_filesystem_close_t        close;
    131     rtems_filesystem_read_t         read;
    132     rtems_filesystem_write_t        write;
    133     rtems_filesystem_ioctl_t        ioctl;
    134     rtems_filesystem_lseek_t        lseek;
    135     rtems_filesystem_fstat_t        fstat;
    136     rtems_filesystem_fchmod_t       fchmod;
    137     rtems_filesystem_ftruncate_t    ftruncate;
    138     rtems_filesystem_fpathconf_t    fpathconf;
    139     rtems_filesystem_fsync_t        fsync;
    140     rtems_filesystem_fdatasync_t    fdatasync;
    141     rtems_filesystem_fcntl_t        fcntl;
    142     rtems_filesystem_rmnod_t        rmnod;
     129    rtems_filesystem_open_t         open_h;
     130    rtems_filesystem_close_t        close_h;
     131    rtems_filesystem_read_t         read_h;
     132    rtems_filesystem_write_t        write_h;
     133    rtems_filesystem_ioctl_t        ioctl_h;
     134    rtems_filesystem_lseek_t        lseek_h;
     135    rtems_filesystem_fstat_t        fstat_h;
     136    rtems_filesystem_fchmod_t       fchmod_h;
     137    rtems_filesystem_ftruncate_t    ftruncate_h;
     138    rtems_filesystem_fpathconf_t    fpathconf_h;
     139    rtems_filesystem_fsync_t        fsync_h;
     140    rtems_filesystem_fdatasync_t    fdatasync_h;
     141    rtems_filesystem_fcntl_t        fcntl_h;
     142    rtems_filesystem_rmnod_t        rmnod_h;
    143143} rtems_filesystem_file_handlers_r;
    144144
     
    250250 */
    251251typedef struct {
    252     rtems_filesystem_evalpath_t      evalpath;
    253     rtems_filesystem_evalmake_t      evalformake;
    254     rtems_filesystem_link_t          link;
    255     rtems_filesystem_unlink_t        unlink;
    256     rtems_filesystem_node_type_t     node_type;
    257     rtems_filesystem_mknod_t         mknod;
    258     rtems_filesystem_chown_t         chown;
    259     rtems_filesystem_freenode_t      freenod;
    260     rtems_filesystem_mount_t         mount;
    261     rtems_filesystem_fsmount_me_t    fsmount_me;
    262     rtems_filesystem_unmount_t       unmount;
    263     rtems_filesystem_fsunmount_me_t  fsunmount_me;
    264     rtems_filesystem_utime_t         utime;
    265     rtems_filesystem_evaluate_link_t eval_link;
    266     rtems_filesystem_symlink_t       symlink;
    267     rtems_filesystem_readlink_t      readlink;
     252    rtems_filesystem_evalpath_t      evalpath_h;
     253    rtems_filesystem_evalmake_t      evalformake_h;
     254    rtems_filesystem_link_t          link_h;
     255    rtems_filesystem_unlink_t        unlink_h;
     256    rtems_filesystem_node_type_t     node_type_h;
     257    rtems_filesystem_mknod_t         mknod_h;
     258    rtems_filesystem_chown_t         chown_h;
     259    rtems_filesystem_freenode_t      freenod_h;
     260    rtems_filesystem_mount_t         mount_h;
     261    rtems_filesystem_fsmount_me_t    fsmount_me_h;
     262    rtems_filesystem_unmount_t       unmount_h;
     263    rtems_filesystem_fsunmount_me_t  fsunmount_me_h;
     264    rtems_filesystem_utime_t         utime_h;
     265    rtems_filesystem_evaluate_link_t eval_link_h;
     266    rtems_filesystem_symlink_t       symlink_h;
     267    rtems_filesystem_readlink_t      readlink_h;
    268268} rtems_filesystem_operations_table;
    269269
  • cpukit/libcsupport/include/rtems/libio_.h

    r527b508 r9c3fa30  
    169169#define rtems_filesystem_freenode( _node ) \
    170170  do { \
    171     if ( (_node)->ops->freenod ) \
    172       (*(_node)->ops->freenod)( (_node) ); \
     171    if ( (_node)->ops->freenod_h ) \
     172      (*(_node)->ops->freenod_h)( (_node) ); \
    173173  } while (0)
    174174
  • cpukit/libcsupport/src/chdir.c

    r527b508 r9c3fa30  
    3838   */
    3939
    40   if ( !loc.ops->node_type ) {
     40  if ( !loc.ops->node_type_h ) {
    4141    rtems_filesystem_freenode( &loc );
    4242    set_errno_and_return_minus_one( ENOTSUP );
    4343  }
    4444
    45   if (  (*loc.ops->node_type)( &loc ) != RTEMS_FILESYSTEM_DIRECTORY ) {
     45  if (  (*loc.ops->node_type_h)( &loc ) != RTEMS_FILESYSTEM_DIRECTORY ) {
    4646    rtems_filesystem_freenode( &loc );
    4747    set_errno_and_return_minus_one( ENOTDIR );
  • cpukit/libcsupport/src/chmod.c

    r527b508 r9c3fa30  
    3939  }
    4040
    41   if ( !loc.handlers->fchmod ){
     41  if ( !loc.handlers->fchmod_h ){
    4242    rtems_filesystem_freenode( &loc );
    4343    set_errno_and_return_minus_one( ENOTSUP );
    4444  }
    4545
    46   result = (*loc.handlers->fchmod)( &loc, mode );
     46  result = (*loc.handlers->fchmod_h)( &loc, mode );
    4747
    4848  rtems_filesystem_freenode( &loc );
  • cpukit/libcsupport/src/chown.c

    r527b508 r9c3fa30  
    3232    return -1;
    3333 
    34   if ( !loc.ops->chown ) {
     34  if ( !loc.ops->chown_h ) {
    3535    rtems_filesystem_freenode( &loc );
    3636    set_errno_and_return_minus_one( ENOTSUP );
    3737  }
    3838
    39   result = (*loc.ops->chown)( &loc, owner, group );
     39  result = (*loc.ops->chown_h)( &loc, owner, group );
    4040
    4141  rtems_filesystem_freenode( &loc );
  • cpukit/libcsupport/src/close.c

    r527b508 r9c3fa30  
    2626
    2727  rc = RTEMS_SUCCESSFUL;
    28   if ( iop->handlers->close )
    29     rc = (*iop->handlers->close)( iop );
     28  if ( iop->handlers->close_h )
     29    rc = (*iop->handlers->close_h)( iop );
    3030
    3131  rtems_libio_free( iop );
  • cpukit/libcsupport/src/eval.c

    r527b508 r9c3fa30  
    4444  rtems_filesystem_get_start_loc( pathname, &i, pathloc );
    4545
    46   if ( !pathloc->ops->evalpath )
     46  if ( !pathloc->ops->evalpath_h )
    4747    set_errno_and_return_minus_one( ENOTSUP );
    4848
    49   result = (*pathloc->ops->evalpath)( &pathname[i], flags, pathloc );
     49  result = (*pathloc->ops->evalpath_h)( &pathname[i], flags, pathloc );
    5050
    5151  /*
     
    5656  if ( (result == 0) && follow_link ) {
    5757
    58     if ( !pathloc->ops->node_type )
     58    if ( !pathloc->ops->node_type_h )
    5959      set_errno_and_return_minus_one( ENOTSUP );
    6060
    61     type = (*pathloc->ops->node_type)( pathloc );
     61    type = (*pathloc->ops->node_type_h)( pathloc );
    6262
    6363    if ( ( type == RTEMS_FILESYSTEM_HARD_LINK ) ||
    6464         ( type == RTEMS_FILESYSTEM_SYM_LINK ) ) {
    6565
    66         if ( !pathloc->ops->eval_link )
     66        if ( !pathloc->ops->eval_link_h )
    6767          set_errno_and_return_minus_one( ENOTSUP );
    6868
    69          result =  (*pathloc->ops->eval_link)( pathloc, flags );
     69         result =  (*pathloc->ops->eval_link_h)( pathloc, flags );
    7070 
    7171    }
  • cpukit/libcsupport/src/fchdir.c

    r527b508 r9c3fa30  
    4444  }
    4545
    46   if ( !iop->pathinfo.ops->node_type ) {
     46  if ( !iop->pathinfo.ops->node_type_h ) {
    4747    set_errno_and_return_minus_one( ENOTSUP );
    4848  }
    4949
    50   if (  (*iop->pathinfo.ops->node_type)( &iop->pathinfo ) !=
     50  if (  (*iop->pathinfo.ops->node_type_h)( &iop->pathinfo ) !=
    5151                                          RTEMS_FILESYSTEM_DIRECTORY ) {
    5252    set_errno_and_return_minus_one( ENOTDIR );
  • cpukit/libcsupport/src/fchmod.c

    r527b508 r9c3fa30  
    3737  rtems_libio_check_permissions( iop, LIBIO_FLAGS_WRITE );
    3838
    39   if ( !iop->handlers->fchmod )
     39  if ( !iop->handlers->fchmod_h )
    4040    set_errno_and_return_minus_one( ENOTSUP );
    4141
    42   return (*iop->pathinfo.handlers->fchmod)( &iop->pathinfo, mode );
     42  return (*iop->pathinfo.handlers->fchmod_h)( &iop->pathinfo, mode );
    4343}
    4444
  • cpukit/libcsupport/src/fcntl.c

    r527b508 r9c3fa30  
    133133  }
    134134  if (ret >= 0) {   
    135     if (iop->handlers->fcntl) {
    136       int err = (*iop->handlers->fcntl)( cmd, iop );
     135    if (iop->handlers->fcntl_h) {
     136      int err = (*iop->handlers->fcntl_h)( cmd, iop );
    137137      if (err) {
    138138        errno = err;
  • cpukit/libcsupport/src/fdatasync.c

    r527b508 r9c3fa30  
    3131   */
    3232
    33   if ( !iop->handlers->fdatasync )
     33  if ( !iop->handlers->fdatasync_h )
    3434    set_errno_and_return_minus_one( ENOTSUP );
    3535
    36   return (*iop->handlers->fdatasync)( iop );
     36  return (*iop->handlers->fdatasync_h)( iop );
    3737}
  • cpukit/libcsupport/src/fstat.c

    r527b508 r9c3fa30  
    4343    set_errno_and_return_minus_one( EBADF );
    4444
    45   if ( !iop->handlers->fstat )
     45  if ( !iop->handlers->fstat_h )
    4646    set_errno_and_return_minus_one( ENOTSUP );
    4747
     
    5252  memset( sbuf, 0, sizeof(struct stat) );
    5353
    54   return (*iop->handlers->fstat)( &iop->pathinfo, sbuf );
     54  return (*iop->handlers->fstat_h)( &iop->pathinfo, sbuf );
    5555}
    5656
  • cpukit/libcsupport/src/fsync.c

    r527b508 r9c3fa30  
    3434    set_errno_and_return_minus_one( EBADF );
    3535
    36   if ( !iop->handlers->fsync )
     36  if ( !iop->handlers->fsync_h )
    3737    set_errno_and_return_minus_one( ENOTSUP );
    3838
    39   return (*iop->handlers->fsync)( iop );
     39  return (*iop->handlers->fsync_h)( iop );
    4040}
  • cpukit/libcsupport/src/ftruncate.c

    r527b508 r9c3fa30  
    3838
    3939  loc = iop->pathinfo;
    40   if ( !loc.ops->node_type )
     40  if ( !loc.ops->node_type_h )
    4141    set_errno_and_return_minus_one( ENOTSUP );
    4242   
    43   if ( (*loc.ops->node_type)( &loc ) == RTEMS_FILESYSTEM_DIRECTORY )
     43  if ( (*loc.ops->node_type_h)( &loc ) == RTEMS_FILESYSTEM_DIRECTORY )
    4444    set_errno_and_return_minus_one( EISDIR );
    4545
    4646  rtems_libio_check_permissions( iop, LIBIO_FLAGS_WRITE );
    4747
    48   if ( !iop->handlers->ftruncate )
     48  if ( !iop->handlers->ftruncate_h )
    4949    set_errno_and_return_minus_one( ENOTSUP );
    5050
    51   return (*iop->handlers->ftruncate)( iop, length );
     51  return (*iop->handlers->ftruncate_h)( iop, length );
    5252}
    5353 
  • cpukit/libcsupport/src/getdents.c

    r527b508 r9c3fa30  
    4141   */
    4242  loc = iop->pathinfo;
    43   if ( !loc.ops->node_type )
     43  if ( !loc.ops->node_type_h )
    4444    set_errno_and_return_minus_one( ENOTSUP );
    4545   
    46   if ( (*loc.ops->node_type)( &loc ) != RTEMS_FILESYSTEM_DIRECTORY )
     46  if ( (*loc.ops->node_type_h)( &loc ) != RTEMS_FILESYSTEM_DIRECTORY )
    4747    set_errno_and_return_minus_one( ENOTDIR );
    4848
     
    5252   */
    5353
    54   if ( !iop->handlers->read )
     54  if ( !iop->handlers->read_h )
    5555    set_errno_and_return_minus_one( ENOTSUP );
    5656
    57   return (*iop->handlers->read)( iop, dd_buf, dd_len  );
     57  return (*iop->handlers->read_h)( iop, dd_buf, dd_len  );
    5858}
  • cpukit/libcsupport/src/ioctl.c

    r527b508 r9c3fa30  
    4545    set_errno_and_return_minus_one( EBADF );
    4646
    47   if ( !iop->handlers->ioctl )
     47  if ( !iop->handlers->ioctl_h )
    4848    set_errno_and_return_minus_one( ENOTSUP );
    4949
    50   rc = (*iop->handlers->ioctl)( iop, command, buffer );
     50  rc = (*iop->handlers->ioctl_h)( iop, command, buffer );
    5151
    5252  return rc;
  • cpukit/libcsupport/src/link.c

    r527b508 r9c3fa30  
    4343  rtems_filesystem_get_start_loc( new, &i, &parent_loc );
    4444
    45   if ( !parent_loc.ops->evalformake ) {
     45  if ( !parent_loc.ops->evalformake_h ) {
    4646    rtems_filesystem_freenode( &existing_loc );
    4747    rtems_filesystem_freenode( &parent_loc );
     
    4949  }
    5050
    51   result = (*parent_loc.ops->evalformake)( &new[i], &parent_loc, &name_start );
     51  result = (*parent_loc.ops->evalformake_h)( &new[i], &parent_loc, &name_start );
    5252  if ( result != 0 ) {
    5353    rtems_filesystem_freenode( &existing_loc );
     
    6767  }
    6868
    69   if ( !parent_loc.ops->link ) {
     69  if ( !parent_loc.ops->link_h ) {
    7070    rtems_filesystem_freenode( &existing_loc );
    7171    rtems_filesystem_freenode( &parent_loc );
     
    7373  }
    7474
    75   result = (*parent_loc.ops->link)( &existing_loc, &parent_loc, name_start );
     75  result = (*parent_loc.ops->link_h)( &existing_loc, &parent_loc, name_start );
    7676 
    7777  rtems_filesystem_freenode( &existing_loc );
  • cpukit/libcsupport/src/lseek.c

    r527b508 r9c3fa30  
    5050  }
    5151
    52   if ( !iop->handlers->lseek )
     52  if ( !iop->handlers->lseek_h )
    5353    set_errno_and_return_minus_one( ENOTSUP );
    5454
    55   return (*iop->handlers->lseek)( iop, offset, whence );
     55  return (*iop->handlers->lseek_h)( iop, offset, whence );
    5656}
    5757
  • cpukit/libcsupport/src/mknod.c

    r527b508 r9c3fa30  
    4444  rtems_filesystem_get_start_loc( pathname, &i, &temp_loc );
    4545
    46   if ( !temp_loc.ops->evalformake ) {
     46  if ( !temp_loc.ops->evalformake_h ) {
    4747    rtems_filesystem_freenode( &temp_loc );
    4848    set_errno_and_return_minus_one( ENOTSUP );
    4949  }
    5050
    51   result = (*temp_loc.ops->evalformake)(
     51  result = (*temp_loc.ops->evalformake_h)(
    5252    &pathname[i],
    5353    &temp_loc,
     
    5757    return -1;
    5858
    59   if ( !temp_loc.ops->mknod ) {
     59  if ( !temp_loc.ops->mknod_h ) {
    6060    rtems_filesystem_freenode( &temp_loc );
    6161    set_errno_and_return_minus_one( ENOTSUP );
    6262  }
    6363
    64   result =  (*temp_loc.ops->mknod)( name_start, mode, dev, &temp_loc );
     64  result =  (*temp_loc.ops->mknod_h)( name_start, mode, dev, &temp_loc );
    6565
    6666  rtems_filesystem_freenode( &temp_loc );
  • cpukit/libcsupport/src/mount.c

    r527b508 r9c3fa30  
    152152
    153153    loc_to_free = &loc;
    154     if ( loc.ops->node_type( &loc ) != RTEMS_FILESYSTEM_DIRECTORY ) {
     154    if ( loc.ops->node_type_h( &loc ) != RTEMS_FILESYSTEM_DIRECTORY ) {
    155155      errno = ENOTDIR;
    156156      goto cleanup_and_bail;
     
    184184     */
    185185
    186     if ( !loc.ops->mount ){
     186    if ( !loc.ops->mount_h ){
    187187      errno = ENOTSUP;
    188188      goto cleanup_and_bail;
    189189    }
    190190
    191     if ( loc.ops->mount( temp_mt_entry ) ) {
     191    if ( loc.ops->mount_h( temp_mt_entry ) ) {
    192192      goto cleanup_and_bail;
    193193    }
     
    210210  }
    211211
    212   if ( !fs_ops->fsmount_me ) {
     212  if ( !fs_ops->fsmount_me_h ) {
    213213    errno = ENOTSUP;
    214214    goto cleanup_and_bail;
    215215  }
    216216
    217   if ( fs_ops->fsmount_me( temp_mt_entry ) )
     217  if ( fs_ops->fsmount_me_h( temp_mt_entry ) )
    218218    goto cleanup_and_bail;
    219219
  • cpukit/libcsupport/src/open.c

    r527b508 r9c3fa30  
    149149  iop->pathinfo   = loc;
    150150
    151   if ( !iop->handlers->open ) {
     151  if ( !iop->handlers->open_h ) {
    152152    rc = ENOTSUP;
    153153    goto done;
    154154  }
    155155
    156   rc = (*iop->handlers->open)( iop, pathname, flags, mode );
     156  rc = (*iop->handlers->open_h)( iop, pathname, flags, mode );
    157157  if ( rc )
    158158    goto done;
  • cpukit/libcsupport/src/read.c

    r527b508 r9c3fa30  
    3434   */
    3535
    36   if ( !iop->handlers->read )
     36  if ( !iop->handlers->read_h )
    3737    set_errno_and_return_minus_one( ENOTSUP );
    3838
    39   rc = (*iop->handlers->read)( iop, buffer, count );
     39  rc = (*iop->handlers->read_h)( iop, buffer, count );
    4040
    4141  if ( rc > 0 )
  • cpukit/libcsupport/src/readlink.c

    r527b508 r9c3fa30  
    3030     return -1;
    3131 
    32   if ( !loc.ops->node_type ){
     32  if ( !loc.ops->node_type_h ){
    3333    rtems_filesystem_freenode( &loc );
    3434    set_errno_and_return_minus_one( ENOTSUP );
    3535  }
    3636
    37   if (  (*loc.ops->node_type)( &loc ) != RTEMS_FILESYSTEM_SYM_LINK ){
     37  if (  (*loc.ops->node_type_h)( &loc ) != RTEMS_FILESYSTEM_SYM_LINK ){
    3838    rtems_filesystem_freenode( &loc );
    3939    set_errno_and_return_minus_one( EINVAL );
    4040  }
    4141
    42   if ( !loc.ops->readlink ){
     42  if ( !loc.ops->readlink_h ){
    4343    rtems_filesystem_freenode( &loc );
    4444    set_errno_and_return_minus_one( ENOTSUP );
    4545  }
    4646
    47   result =  (*loc.ops->readlink)( &loc, buf, bufsize );
     47  result =  (*loc.ops->readlink_h)( &loc, buf, bufsize );
    4848
    4949  rtems_filesystem_freenode( &loc );
  • cpukit/libcsupport/src/rmdir.c

    r527b508 r9c3fa30  
    3939   */
    4040
    41   if ( !loc.ops->node_type ){
     41  if ( !loc.ops->node_type_h ){
    4242    rtems_filesystem_freenode( &loc );
    4343    set_errno_and_return_minus_one( ENOTSUP );
    4444  }
    4545
    46   if (  (*loc.ops->node_type)( &loc ) != RTEMS_FILESYSTEM_DIRECTORY ){
     46  if (  (*loc.ops->node_type_h)( &loc ) != RTEMS_FILESYSTEM_DIRECTORY ){
    4747    rtems_filesystem_freenode( &loc );
    4848    set_errno_and_return_minus_one( ENOTDIR );
     
    5353   */
    5454
    55   if ( !loc.handlers->rmnod ){
     55  if ( !loc.handlers->rmnod_h ){
    5656    rtems_filesystem_freenode( &loc );
    5757    set_errno_and_return_minus_one( ENOTSUP );
    5858  }
    5959
    60   result =  (*loc.handlers->rmnod)( &loc ); 
     60  result =  (*loc.handlers->rmnod_h)( &loc ); 
    6161
    6262  rtems_filesystem_freenode( &loc );
  • cpukit/libcsupport/src/stat.c

    r527b508 r9c3fa30  
    5858    return -1;
    5959 
    60   if ( !loc.handlers->fstat ){
     60  if ( !loc.handlers->fstat_h ){
    6161    rtems_filesystem_freenode( &loc );
    6262    set_errno_and_return_minus_one( ENOTSUP );
     
    7070  memset( buf, 0, sizeof(struct stat) );
    7171
    72   status =  (*loc.handlers->fstat)( &loc, buf );
     72  status =  (*loc.handlers->fstat_h)( &loc, buf );
    7373
    7474  rtems_filesystem_freenode( &loc );
  • cpukit/libcsupport/src/symlink.c

    r527b508 r9c3fa30  
    2525
    2626  rtems_filesystem_get_start_loc( sympath, &i, &loc );
    27   result = (*loc.ops->evalformake)( &sympath[i], &loc, &name_start );
     27  result = (*loc.ops->evalformake_h)( &sympath[i], &loc, &name_start );
    2828  if ( result != 0 )
    2929    return -1;
    3030
    31   if ( !loc.ops->symlink ) {
     31  if ( !loc.ops->symlink_h ) {
    3232    rtems_filesystem_freenode( &loc );
    3333    set_errno_and_return_minus_one( ENOTSUP );
    3434  }
    3535
    36   result = (*loc.ops->symlink)( &loc, actualpath, name_start);
     36  result = (*loc.ops->symlink_h)( &loc, actualpath, name_start);
    3737
    3838  rtems_filesystem_freenode( &loc );
  • cpukit/libcsupport/src/unlink.c

    r527b508 r9c3fa30  
    3131     return -1;
    3232 
    33   if ( !loc.ops->node_type ) {
     33  if ( !loc.ops->node_type_h ) {
    3434    rtems_filesystem_freenode( &loc );
    3535    set_errno_and_return_minus_one( ENOTSUP );
    3636  }
    3737
    38   if (  (*loc.ops->node_type)( &loc ) == RTEMS_FILESYSTEM_DIRECTORY ) {
     38  if (  (*loc.ops->node_type_h)( &loc ) == RTEMS_FILESYSTEM_DIRECTORY ) {
    3939    rtems_filesystem_freenode( &loc );
    4040    set_errno_and_return_minus_one( EISDIR );
    4141  }
    4242
    43   if ( !loc.ops->unlink ) {
     43  if ( !loc.ops->unlink_h ) {
    4444    rtems_filesystem_freenode( &loc );
    4545    set_errno_and_return_minus_one( ENOTSUP );
    4646  }
    4747
    48   result = (*loc.ops->unlink)( &loc );
     48  result = (*loc.ops->unlink_h)( &loc );
    4949
    5050  rtems_filesystem_freenode( &loc );
  • cpukit/libcsupport/src/unmount.c

    r527b508 r9c3fa30  
    106106   */
    107107
    108   if ((temp_mt_entry.mt_point_node.ops->unmount )( temp_loc.mt_entry ) != 0 ) {
     108  if ((temp_mt_entry.mt_point_node.ops->unmount_h )( temp_loc.mt_entry ) != 0 ) {
    109109    rtems_filesystem_freenode( &temp_loc );
    110110    return -1;
     
    115115   */
    116116
    117   if ((temp_mt_entry.mt_fs_root.ops->fsunmount_me )( temp_loc.mt_entry ) != 0){
     117  if ((temp_mt_entry.mt_fs_root.ops->fsunmount_me_h )( temp_loc.mt_entry ) != 0){
    118118    rtems_filesystem_freenode( &temp_loc );
    119119    return -1;
  • cpukit/libcsupport/src/utime.c

    r527b508 r9c3fa30  
    2929    return -1;
    3030
    31   if ( !temp_loc.ops->utime )
     31  if ( !temp_loc.ops->utime_h )
    3232    set_errno_and_return_minus_one( ENOTSUP );
    3333
    34   result = (*temp_loc.ops->utime)( &temp_loc, times->actime, times->modtime );
     34  result = (*temp_loc.ops->utime_h)( &temp_loc, times->actime, times->modtime );
    3535
    3636  rtems_filesystem_freenode( &temp_loc );
  • cpukit/libcsupport/src/write.c

    r527b508 r9c3fa30  
    4242   */
    4343
    44   if ( !iop->handlers->write )
     44  if ( !iop->handlers->write_h )
    4545    set_errno_and_return_minus_one( ENOTSUP );
    4646
    47   rc = (*iop->handlers->write)( iop, buffer, count );
     47  rc = (*iop->handlers->write_h)( iop, buffer, count );
    4848
    4949  if ( rc > 0 )
  • cpukit/libfs/src/imfs/imfs_eval.c

    r527b508 r9c3fa30  
    334334            newloc = pathloc->mt_entry->mt_point_node;
    335335            *pathloc = newloc;
    336             return (*pathloc->ops->evalformake)( &path[i-len], pathloc, name );
     336            return (*pathloc->ops->evalformake_h)( &path[i-len], pathloc, name );
    337337          }
    338338        } else {
     
    382382          newloc  = node->info.directory.mt_fs->mt_fs_root;
    383383          *pathloc = newloc;
    384           return (*pathloc->ops->evalformake)( &path[i-len], pathloc, name );
     384          return (*pathloc->ops->evalformake_h)( &path[i-len], pathloc, name );
    385385        }
    386386
     
    527527            newloc = pathloc->mt_entry->mt_point_node;
    528528            *pathloc = newloc;
    529             return (*pathloc->ops->evalpath)(&(pathname[i-len]),flags,pathloc);
     529            return (*pathloc->ops->evalpath_h)(&(pathname[i-len]),flags,pathloc);
    530530          }
    531531        } else {
     
    579579          newloc   = node->info.directory.mt_fs->mt_fs_root;
    580580          *pathloc = newloc;
    581           return (*pathloc->ops->evalpath)( &pathname[i-len], flags, pathloc );
     581          return (*pathloc->ops->evalpath_h)( &pathname[i-len], flags, pathloc );
    582582        }
    583583
  • cpukit/libfs/src/imfs/imfs_unlink.c

    r527b508 r9c3fa30  
    2626  IMFS_jnode_t                      *node;
    2727  rtems_filesystem_location_info_t   the_link;
    28   int                                result;
     28  int                                result = 0;
    2929 
    3030  node = loc->node_access;
     
    5757    IMFS_update_ctime( node->info.hard_link.link_node );
    5858    if ( node->info.hard_link.link_node->st_nlink < 1) {
    59       result = (*the_link.handlers->rmnod)( &the_link );
     59      result = (*the_link.handlers->rmnod_h)( &the_link );
    6060      if ( result != 0 )
    6161        return -1;
     
    6767   */
    6868
    69   result = (*loc->handlers->rmnod)( loc );
     69  result = (*loc->handlers->rmnod_h)( loc );
    7070
    7171  return result;
  • cpukit/libfs/src/imfs/ioman.c

    r527b508 r9c3fa30  
    8181  the_jnode = loc.node_access;
    8282
    83   if ( !loc.ops->node_type ) {
     83  if ( !loc.ops->node_type_h ) {
    8484    rtems_filesystem_freenode( &loc );
    8585    set_errno_and_return_minus_one( ENOTSUP );
    8686  }
    8787
    88   node_type = (*loc.ops->node_type)( &loc );
     88  node_type = (*loc.ops->node_type_h)( &loc );
    8989
    9090  if ( (result != 0) || node_type != RTEMS_FILESYSTEM_DEVICE ) {
Note: See TracChangeset for help on using the changeset viewer.