qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update. 

* 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.
This commit is contained in:
Ulrich Drepper 2000-11-24 23:39:37 +00:00
parent 2debc8c54b
commit 9c0592ab3b
4 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -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> 2000-11-24 Ulrich Drepper <drepper@redhat.com>
* iconv/gconv_conf.c (insert_module): Replace old entry if new one * 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> 2000-11-23 Jakub Jelinek <jakub@redhat.com>

12
iconv/gconv_conf.c
View File

@ -202,12 +202,14 @@ insert_module (struct gconv_module *newp, int tobefreed)
|| (newp->cost_hi == root->cost_hi || (newp->cost_hi == root->cost_hi
&& newp->cost_lo < root->cost_lo)) && newp->cost_lo < root->cost_lo))
{ {
root->cost_hi = newp->cost_hi; newp->left = root->left;
root->cost_lo = newp->cost_lo; newp->right = root->right;
root->module_name = newp->module_name; newp->same = root->same;
} *rootp = newp;
if (tobefreed) free (root);
}
else if (tobefreed)
free (newp); free (newp);
return; return;
} }

13
rt/tst-aio6.c
View File

@ -29,7 +29,7 @@
#define TEST_FUNCTION do_test () #define TEST_FUNCTION do_test ()
int static int
do_test (void) do_test (void)
{ {
struct aiocb *arr[1]; struct aiocb *arr[1];
@ -38,11 +38,18 @@ do_test (void)
struct timeval before; struct timeval before;
struct timeval after; struct timeval after;
struct timespec timeout; struct timespec timeout;
int fd[2];
int result = 0; int result = 0;
if (pipe (fd) != 0)
{
printf ("cannot create pipe: %m\n");
return 1;
}
arr[0] = &cb; arr[0] = &cb;
cb.aio_fildes = STDIN_FILENO; cb.aio_fildes = fd[0];
cb.aio_lio_opcode = LIO_WRITE; cb.aio_lio_opcode = LIO_WRITE;
cb.aio_reqprio = 0; cb.aio_reqprio = 0;
cb.aio_buf = (void *) buf; cb.aio_buf = (void *) buf;
@ -52,7 +59,7 @@ do_test (void)
/* Try to read from stdin where nothing will be available. */ /* Try to read from stdin where nothing will be available. */
if (aio_read (arr[0]) < 0) if (aio_read (arr[0]) < 0)
{ {
printf ("aio_write failed: %m\n"); printf ("aio_read failed: %m\n");
return 1; return 1;
} }

6
test-skeleton.c
View File

@ -62,7 +62,7 @@ struct name_list
} *name_list; } *name_list;
/* Add temporary files in list. */ /* Add temporary files in list. */
void static void
add_temp_file (const char *name) add_temp_file (const char *name)
{ {
struct name_list *newp = (struct name_list *) calloc (sizeof (*newp), 1); struct name_list *newp = (struct name_list *) calloc (sizeof (*newp), 1);
@ -77,7 +77,7 @@ add_temp_file (const char *name)
} }
/* Delete all temporary files. */ /* Delete all temporary files. */
void static void
delete_temp_files (void) delete_temp_files (void)
{ {
while (name_list != NULL) while (name_list != NULL)
@ -88,7 +88,7 @@ delete_temp_files (void)
} }
/* Timeout handler. We kill the child and exit with an error. */ /* Timeout handler. We kill the child and exit with an error. */
void static void
timeout_handler (int sig __attribute__ ((unused))) timeout_handler (int sig __attribute__ ((unused)))
{ {
int killed; int killed;