Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=81acbcd6c54c89a9eb09c1b9ca3bd952f6989c10
Commit:     81acbcd6c54c89a9eb09c1b9ca3bd952f6989c10
Parent:     ca939e79e395ce2b9ffb8e97763024b61b1e2ad8
Author:     Andrew Morton <[EMAIL PROTECTED]>
AuthorDate: Tue Oct 16 01:27:59 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Tue Oct 16 09:43:11 2007 -0700

    ecryptfs: printk warning fixes
    
    fs/ecryptfs/keystore.c: In function 'parse_tag_1_packet':
    fs/ecryptfs/keystore.c:557: warning: format '%d' expects type 'int', but 
argument 2 has type 'size_t'
    fs/ecryptfs/keystore.c: In function 'parse_tag_3_packet':
    fs/ecryptfs/keystore.c:690: warning: format '%d' expects type 'int', but 
argument 2 has type 'size_t'
    fs/ecryptfs/keystore.c: In function 'parse_tag_11_packet':
    fs/ecryptfs/keystore.c:836: warning: format '%d' expects type 'int', but 
argument 2 has type 'size_t'
    fs/ecryptfs/keystore.c: In function 'write_tag_1_packet':
    fs/ecryptfs/keystore.c:1413: warning: format '%d' expects type 'int', but 
argument 2 has type 'size_t'
    fs/ecryptfs/keystore.c:1413: warning: format '%d' expects type 'int', but 
argument 3 has type 'long unsigned int'
    fs/ecryptfs/keystore.c: In function 'write_tag_11_packet':
    fs/ecryptfs/keystore.c:1472: warning: format '%d' expects type 'int', but 
argument 2 has type 'size_t'
    fs/ecryptfs/keystore.c: In function 'write_tag_3_packet':
    fs/ecryptfs/keystore.c:1663: warning: format '%d' expects type 'int', but 
argument 2 has type 'size_t'
    fs/ecryptfs/keystore.c:1663: warning: format '%d' expects type 'int', but 
argument 3 has type 'long unsigned int'
    fs/ecryptfs/keystore.c: In function 'ecryptfs_generate_key_packet_set':
    fs/ecryptfs/keystore.c:1778: warning: passing argument 2 of 
'write_tag_11_packet' from incompatible pointer type
    fs/ecryptfs/main.c: In function 'ecryptfs_parse_options':
    fs/ecryptfs/main.c:363: warning: format '%d' expects type 'int', but 
argument 3 has type 'size_t'
    
    Cc: Michael Halcrow <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
 fs/ecryptfs/keystore.c |   16 ++++++++--------
 fs/ecryptfs/main.c     |    2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/fs/ecryptfs/keystore.c b/fs/ecryptfs/keystore.c
index 190e2a0..778bdf9 100644
--- a/fs/ecryptfs/keystore.c
+++ b/fs/ecryptfs/keystore.c
@@ -554,7 +554,7 @@ parse_tag_1_packet(struct ecryptfs_crypt_stat *crypt_stat,
                goto out_free;
        }
        if (unlikely(body_size < (ECRYPTFS_SIG_SIZE + 2))) {
-               printk(KERN_WARNING "Invalid body size ([%d])\n", body_size);
+               printk(KERN_WARNING "Invalid body size ([%td])\n", body_size);
                rc = -EINVAL;
                goto out_free;
        }
@@ -687,7 +687,7 @@ parse_tag_3_packet(struct ecryptfs_crypt_stat *crypt_stat,
                goto out_free;
        }
        if (unlikely(body_size < (ECRYPTFS_SALT_SIZE + 5))) {
-               printk(KERN_WARNING "Invalid body size ([%d])\n", body_size);
+               printk(KERN_WARNING "Invalid body size ([%td])\n", body_size);
                rc = -EINVAL;
                goto out_free;
        }
@@ -833,7 +833,7 @@ parse_tag_11_packet(unsigned char *data, unsigned char 
*contents,
                goto out;
        }
        if (body_size < 14) {
-               printk(KERN_WARNING "Invalid body size ([%d])\n", body_size);
+               printk(KERN_WARNING "Invalid body size ([%td])\n", body_size);
                rc = -EINVAL;
                goto out;
        }
@@ -1409,7 +1409,7 @@ encrypted_session_key_set:
                           + key_rec->enc_key_size); /* Encrypted key size */
        if (max_packet_size > (*remaining_bytes)) {
                printk(KERN_ERR "Packet length larger than maximum allowable; "
-                      "need up to [%d] bytes, but there are only [%d] "
+                      "need up to [%td] bytes, but there are only [%td] "
                       "available\n", max_packet_size, (*remaining_bytes));
                rc = -EINVAL;
                goto out;
@@ -1449,7 +1449,7 @@ out:
  * Returns zero on success; non-zero on error.
  */
 static int
-write_tag_11_packet(char *dest, int *remaining_bytes, char *contents,
+write_tag_11_packet(char *dest, size_t *remaining_bytes, char *contents,
                    size_t contents_length, size_t *packet_length)
 {
        size_t packet_size_length;
@@ -1468,7 +1468,7 @@ write_tag_11_packet(char *dest, int *remaining_bytes, 
char *contents,
                           + contents_length); /* Literal data */
        if (max_packet_size > (*remaining_bytes)) {
                printk(KERN_ERR "Packet length larger than maximum allowable; "
-                      "need up to [%d] bytes, but there are only [%d] "
+                      "need up to [%td] bytes, but there are only [%td] "
                       "available\n", max_packet_size, (*remaining_bytes));
                rc = -EINVAL;
                goto out;
@@ -1658,8 +1658,8 @@ encrypted_session_key_set:
                           + 1                       /* Hash iterations */
                           + key_rec->enc_key_size); /* Encrypted key size */
        if (max_packet_size > (*remaining_bytes)) {
-               printk(KERN_ERR "Packet too large; need up to [%d] bytes, but "
-                      "there are only [%d] available\n", max_packet_size,
+               printk(KERN_ERR "Packet too large; need up to [%td] bytes, but "
+                      "there are only [%td] available\n", max_packet_size,
                       (*remaining_bytes));
                rc = -EINVAL;
                goto out;
diff --git a/fs/ecryptfs/main.c b/fs/ecryptfs/main.c
index 0387f0d..71a9c4c 100644
--- a/fs/ecryptfs/main.c
+++ b/fs/ecryptfs/main.c
@@ -359,7 +359,7 @@ static int ecryptfs_parse_options(struct super_block *sb, 
char *options)
                     NULL, mount_crypt_stat->global_default_cipher_name,
                     mount_crypt_stat->global_default_cipher_key_size))) {
                printk(KERN_ERR "Error attempting to initialize cipher with "
-                      "name = [%s] and key size = [%d]; rc = [%d]\n",
+                      "name = [%s] and key size = [%td]; rc = [%d]\n",
                       mount_crypt_stat->global_default_cipher_name,
                       mount_crypt_stat->global_default_cipher_key_size, rc);
                rc = -EINVAL;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to