Changeset a7d1992c in rtems for cpukit/libcsupport/src/rmdir.c


Ignore:
Timestamp:
May 15, 2012, 8:06:18 AM (7 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Children:
1c0263c
Parents:
d5d071d (diff), da154e14 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'upstream'

File:
1 edited

Legend:

Unmodified
Added
Removed
  • cpukit/libcsupport/src/rmdir.c

    rd5d071d ra7d1992c  
    3535      parent_eval_flags
    3636    );
    37   rtems_filesystem_node_types_t type =
    38     (*currentloc->ops->node_type_h)( currentloc );
     37  const rtems_filesystem_operations_table *ops = currentloc->mt_entry->ops;
     38  rtems_filesystem_node_types_t type = (*ops->node_type_h)( currentloc );
    3939
    4040  if ( type == RTEMS_FILESYSTEM_DIRECTORY ) {
    41     rv = (*currentloc->ops->rmnod_h)(
    42       &parentloc,
    43       currentloc
    44     );
     41    rv = (*ops->rmnod_h)( &parentloc, currentloc );
    4542  } else {
    4643    rtems_filesystem_eval_path_error( &ctx, ENOTDIR );
Note: See TracChangeset for help on using the changeset viewer.