Rev 2479 | Only display areas with differences | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 2479 | Rev 4482 | ||
|---|---|---|---|
| 1 | /* |
1 | /* |
| 2 | * Copyright (c) 2006 Josef Cejka |
2 | * Copyright (c) 2006 Josef Cejka |
| 3 | * All rights reserved. |
3 | * All rights reserved. |
| 4 | * |
4 | * |
| 5 | * Redistribution and use in source and binary forms, with or without |
5 | * Redistribution and use in source and binary forms, with or without |
| 6 | * modification, are permitted provided that the following conditions |
6 | * modification, are permitted provided that the following conditions |
| 7 | * are met: |
7 | * are met: |
| 8 | * |
8 | * |
| 9 | * - Redistributions of source code must retain the above copyright |
9 | * - Redistributions of source code must retain the above copyright |
| 10 | * notice, this list of conditions and the following disclaimer. |
10 | * notice, this list of conditions and the following disclaimer. |
| 11 | * - Redistributions in binary form must reproduce the above copyright |
11 | * - Redistributions in binary form must reproduce the above copyright |
| 12 | * notice, this list of conditions and the following disclaimer in the |
12 | * notice, this list of conditions and the following disclaimer in the |
| 13 | * documentation and/or other materials provided with the distribution. |
13 | * documentation and/or other materials provided with the distribution. |
| 14 | * - The name of the author may not be used to endorse or promote products |
14 | * - The name of the author may not be used to endorse or promote products |
| 15 | * derived from this software without specific prior written permission. |
15 | * derived from this software without specific prior written permission. |
| 16 | * |
16 | * |
| 17 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR |
17 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR |
| 18 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
18 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
| 19 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. |
19 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. |
| 20 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, |
20 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, |
| 21 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
21 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
| 22 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
22 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 23 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
23 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 24 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
24 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 25 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
25 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
| 26 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 27 | */ |
27 | */ |
| 28 | 28 | ||
| 29 | /** @addtogroup libc |
29 | /** @addtogroup libc |
| 30 | * @{ |
30 | * @{ |
| 31 | */ |
31 | */ |
| 32 | /** @file |
32 | /** @file |
| 33 | */ |
33 | */ |
| 34 | 34 | ||
| 35 | #include <io/printf_core.h> |
35 | #include <io/printf_core.h> |
| 36 | #include <stdio.h> |
36 | #include <stdio.h> |
| 37 | #include <stdio.h> |
- | |
| 38 | 37 | ||
| 39 | /** Print formatted text. |
38 | /** Print formatted text. |
| - | 39 | * |
|
| - | 40 | * @param stream Output stream |
|
| 40 | * @param fmt format string |
41 | * @param fmt Format string |
| - | 42 | * |
|
| 41 | * \see For more details about format string see printf_core. |
43 | * \see For more details about format string see printf_core. |
| - | 44 | * |
|
| 42 | */ |
45 | */ |
| 43 | int printf(const char *fmt, ...) |
46 | int fprintf(FILE *stream, const char *fmt, ...) |
| 44 | { |
47 | { |
| 45 | int ret; |
- | |
| 46 | va_list args; |
48 | va_list args; |
| - | 49 | va_start(args, fmt); |
|
| - | 50 | ||
| - | 51 | int ret = vfprintf(stream, fmt, args); |
|
| 47 | 52 | ||
| - | 53 | va_end(args); |
|
| - | 54 | ||
| - | 55 | return ret; |
|
| - | 56 | } |
|
| - | 57 | ||
| - | 58 | /** Print formatted text to stdout. |
|
| - | 59 | * |
|
| - | 60 | * @param fmt Format string |
|
| - | 61 | * |
|
| - | 62 | * \see For more details about format string see printf_core. |
|
| - | 63 | * |
|
| - | 64 | */ |
|
| - | 65 | int printf(const char *fmt, ...) |
|
| - | 66 | { |
|
| - | 67 | va_list args; |
|
| 48 | va_start(args, fmt); |
68 | va_start(args, fmt); |
| 49 | 69 | ||
| 50 | ret = vprintf(fmt, args); |
70 | int ret = vprintf(fmt, args); |
| 51 | 71 | ||
| 52 | va_end(args); |
72 | va_end(args); |
| 53 | 73 | ||
| 54 | return ret; |
74 | return ret; |
| 55 | } |
75 | } |
| 56 | 76 | ||
| 57 | /** @} |
77 | /** @} |
| 58 | */ |
78 | */ |
| 59 | 79 | ||