mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH 1/3] crypto: crc32: fix warnings: no previous prototype for 'crc32', 'crc32_no_comp', 'file_crc'
@ 2015-11-17 12:14 Sergey Koshechkin
  2015-11-18  7:30 ` Sascha Hauer
  0 siblings, 1 reply; 2+ messages in thread
From: Sergey Koshechkin @ 2015-11-17 12:14 UTC (permalink / raw)
  To: barebox; +Cc: Sergey Koshechkin

Signed-off-by: Sergey Koshechkin <serge.koshechkin@gmail.com>
---
 crypto/crc32.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/crypto/crc32.c b/crypto/crc32.c
index e7b1bd7..58637bd 100644
--- a/crypto/crc32.c
+++ b/crypto/crc32.c
@@ -16,6 +16,9 @@
 #include <malloc.h>
 #include <linux/ctype.h>
 #include <errno.h>
+#define STATIC
+#else
+#define STATIC static inline
 #endif
 
 #ifdef CONFIG_DYNAMIC_CRC_TABLE
@@ -138,7 +141,7 @@ static const ulong crc_table[256] = {
 #define DO8(buf)  DO4(buf); DO4(buf);
 
 /* ========================================================================= */
-uint32_t crc32(uint32_t crc, const void *_buf, unsigned int len)
+STATIC uint32_t crc32(uint32_t crc, const void *_buf, unsigned int len)
 {
     const unsigned char *buf = _buf;
 
@@ -164,7 +167,7 @@ EXPORT_SYMBOL(crc32);
 /* No ones complement version. JFFS2 (and other things ?)
  * don't use ones compliment in their CRC calculations.
  */
-uint32_t crc32_no_comp(uint32_t crc, const void *_buf, unsigned int len)
+STATIC uint32_t crc32_no_comp(uint32_t crc, const void *_buf, unsigned int len)
 {
    const unsigned char *buf = _buf;
 
@@ -184,7 +187,7 @@ uint32_t crc32_no_comp(uint32_t crc, const void *_buf, unsigned int len)
     return crc;
 }
 
-int file_crc(char *filename, ulong start, ulong size, ulong *crc,
+STATIC int file_crc(char *filename, ulong start, ulong size, ulong *crc,
 		    ulong *total)
 {
 	int fd, now;
-- 
2.6.2


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH 1/3] crypto: crc32: fix warnings: no previous prototype for 'crc32', 'crc32_no_comp', 'file_crc'
  2015-11-17 12:14 [PATCH 1/3] crypto: crc32: fix warnings: no previous prototype for 'crc32', 'crc32_no_comp', 'file_crc' Sergey Koshechkin
@ 2015-11-18  7:30 ` Sascha Hauer
  0 siblings, 0 replies; 2+ messages in thread
From: Sascha Hauer @ 2015-11-18  7:30 UTC (permalink / raw)
  To: Sergey Koshechkin; +Cc: barebox

On Tue, Nov 17, 2015 at 03:14:12PM +0300, Sergey Koshechkin wrote:
> Signed-off-by: Sergey Koshechkin <serge.koshechkin@gmail.com>
> ---
>  crypto/crc32.c | 9 ++++++---
>  1 file changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/crypto/crc32.c b/crypto/crc32.c

Applied, thanks.

Sascha

> index e7b1bd7..58637bd 100644
> --- a/crypto/crc32.c
> +++ b/crypto/crc32.c
> @@ -16,6 +16,9 @@
>  #include <malloc.h>
>  #include <linux/ctype.h>
>  #include <errno.h>
> +#define STATIC
> +#else
> +#define STATIC static inline
>  #endif
>  
>  #ifdef CONFIG_DYNAMIC_CRC_TABLE
> @@ -138,7 +141,7 @@ static const ulong crc_table[256] = {
>  #define DO8(buf)  DO4(buf); DO4(buf);
>  
>  /* ========================================================================= */
> -uint32_t crc32(uint32_t crc, const void *_buf, unsigned int len)
> +STATIC uint32_t crc32(uint32_t crc, const void *_buf, unsigned int len)
>  {
>      const unsigned char *buf = _buf;
>  
> @@ -164,7 +167,7 @@ EXPORT_SYMBOL(crc32);
>  /* No ones complement version. JFFS2 (and other things ?)
>   * don't use ones compliment in their CRC calculations.
>   */
> -uint32_t crc32_no_comp(uint32_t crc, const void *_buf, unsigned int len)
> +STATIC uint32_t crc32_no_comp(uint32_t crc, const void *_buf, unsigned int len)
>  {
>     const unsigned char *buf = _buf;
>  
> @@ -184,7 +187,7 @@ uint32_t crc32_no_comp(uint32_t crc, const void *_buf, unsigned int len)
>      return crc;
>  }
>  
> -int file_crc(char *filename, ulong start, ulong size, ulong *crc,
> +STATIC int file_crc(char *filename, ulong start, ulong size, ulong *crc,
>  		    ulong *total)
>  {
>  	int fd, now;
> -- 
> 2.6.2
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2015-11-18  7:30 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-11-17 12:14 [PATCH 1/3] crypto: crc32: fix warnings: no previous prototype for 'crc32', 'crc32_no_comp', 'file_crc' Sergey Koshechkin
2015-11-18  7:30 ` Sascha Hauer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox