diff options
| author | Marcus Brinkmann <marcus@gnu.org> | 2002-08-22 19:10:52 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <marcus@gnu.org> | 2002-08-22 19:10:52 +0000 |
| commit | 4062fb2fcf938bb6a9c5d8f6404586cab11fe227 (patch) | |
| tree | 698256c7c29a4d23410c0292ba7971af10af8774 /console/console.c | |
| parent | a0dd4055ce2b0d7cce5ccb5d9dad7a62bd83a8dc (diff) | |
| download | hurd-4062fb2fcf938bb6a9c5d8f6404586cab11fe227.tar.gz hurd-4062fb2fcf938bb6a9c5d8f6404586cab11fe227.tar.bz2 hurd-4062fb2fcf938bb6a9c5d8f6404586cab11fe227.zip | |
2002-08-22 Marcus Brinkmann <marcus@gnu.org>
* display.h: Add prototype for display_get_size.
* display.c (display_get_size): New function.
(nowait_file_changed): Update for new interfaces.
* console.c (new_node): Use display_get_size to retrieve size of
display node.
(netfs_get_dirents): Initialize FIRST_VCONS to silence gcc warning.
Diffstat (limited to 'console/console.c')
| -rw-r--r-- | console/console.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/console/console.c b/console/console.c index d25a3cf3..b493f64e 100644 --- a/console/console.c +++ b/console/console.c @@ -357,8 +357,7 @@ new_node (struct node **np, vcons_t vcons, vcons_node_type type) (*np)->nn_stat.st_ino = (vcons->id << 2) + 2; (*np)->nn_stat.st_mode |= S_IFREG; (*np)->nn_stat.st_mode &= ~(S_IXUSR | S_IXGRP | S_IXOTH); - (*np)->nn_stat.st_size = 80*50 * (sizeof (wchar_t) + 4) - + 16 * 4 + 512 * 8; /* XXX */ + (*np)->nn_stat.st_size = display_get_size (vcons->display); break; case VCONS_NODE_INPUT: (*np)->nn_stat.st_ino = (vcons->id << 2) + 3; @@ -728,7 +727,8 @@ netfs_get_dirents (struct iouser *cred, struct node *dir, error_t err; int count = 0; size_t size = 0; /* Total size of our return block. */ - struct vcons *first_vcons, *vcons; + struct vcons *first_vcons = NULL; + struct vcons *vcons; /* Add the length of a directory entry for NAME to SIZE and return true, unless it would overflow MAX_DATA_LEN or NUM_ENTRIES, in which case |