Skip to content

Commit

Permalink
Update.
Browse files Browse the repository at this point in the history
	* test-skeleton.c: Mark local functions as static to avoid warnings.

2000-11-23  H.J. Lu  <hjl@gnu.org>

	* rt/tst-aio6.c (do_test): Use pipe instead of STDIN_FILENO to
	support the background job.
	Fix a typo.

2000-11-24  Ulrich Drepper  <drepper@redhat.com>

	has same names but lower cost.
  • Loading branch information
Ulrich Drepper committed Nov 24, 2000
1 parent 2debc8c commit 9c0592a
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 12 deletions.
12 changes: 11 additions & 1 deletion ChangeLog
Original file line number Diff line number Diff line change
@@ -1,7 +1,17 @@
2000-11-24 Ulrich Drepper <drepper@redhat.com>

* test-skeleton.c: Mark local functions as static to avoid warnings.

2000-11-23 H.J. Lu <hjl@gnu.org>

* rt/tst-aio6.c (do_test): Use pipe instead of STDIN_FILENO to
support the background job.
Fix a typo.

2000-11-24 Ulrich Drepper <drepper@redhat.com>

* iconv/gconv_conf.c (insert_module): Replace old entry if new one
hsa same names but lower cost.
has same names but lower cost.

2000-11-23 Jakub Jelinek <jakub@redhat.com>

Expand Down
12 changes: 7 additions & 5 deletions iconv/gconv_conf.c
Original file line number Diff line number Diff line change
Expand Up @@ -202,12 +202,14 @@ insert_module (struct gconv_module *newp, int tobefreed)
|| (newp->cost_hi == root->cost_hi
&& newp->cost_lo < root->cost_lo))
{
root->cost_hi = newp->cost_hi;
root->cost_lo = newp->cost_lo;
root->module_name = newp->module_name;
}
newp->left = root->left;
newp->right = root->right;
newp->same = root->same;
*rootp = newp;

if (tobefreed)
free (root);
}
else if (tobefreed)
free (newp);
return;
}
Expand Down
13 changes: 10 additions & 3 deletions rt/tst-aio6.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@


#define TEST_FUNCTION do_test ()
int
static int
do_test (void)
{
struct aiocb *arr[1];
Expand All @@ -38,11 +38,18 @@ do_test (void)
struct timeval before;
struct timeval after;
struct timespec timeout;
int fd[2];
int result = 0;

if (pipe (fd) != 0)
{
printf ("cannot create pipe: %m\n");
return 1;
}

arr[0] = &cb;

cb.aio_fildes = STDIN_FILENO;
cb.aio_fildes = fd[0];
cb.aio_lio_opcode = LIO_WRITE;
cb.aio_reqprio = 0;
cb.aio_buf = (void *) buf;
Expand All @@ -52,7 +59,7 @@ do_test (void)
/* Try to read from stdin where nothing will be available. */
if (aio_read (arr[0]) < 0)
{
printf ("aio_write failed: %m\n");
printf ("aio_read failed: %m\n");
return 1;
}

Expand Down
6 changes: 3 additions & 3 deletions test-skeleton.c
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ struct name_list
} *name_list;

/* Add temporary files in list. */
void
static void
add_temp_file (const char *name)
{
struct name_list *newp = (struct name_list *) calloc (sizeof (*newp), 1);
Expand All @@ -77,7 +77,7 @@ add_temp_file (const char *name)
}

/* Delete all temporary files. */
void
static void
delete_temp_files (void)
{
while (name_list != NULL)
Expand All @@ -88,7 +88,7 @@ delete_temp_files (void)
}

/* Timeout handler. We kill the child and exit with an error. */
void
static void
timeout_handler (int sig __attribute__ ((unused)))
{
int killed;
Expand Down

0 comments on commit 9c0592a

Please sign in to comment.