summaryrefslogtreecommitdiff
path: root/pgsql.c
diff options
context:
space:
mode:
authorAndreas Baumann <abaumann@yahoo.com>2012-04-20 14:13:27 +0200
committerAndreas Baumann <abaumann@yahoo.com>2012-04-20 14:13:57 +0200
commit481b1a4955d5be53aa778032280b90e256cf3b7c (patch)
treeedd9913075a799ec2e368f28970e3017680ce6d2 /pgsql.c
parentdaa854033ba1ee2b3b6075bf4f1af516d0d11487 (diff)
downloadpgfuse-481b1a4955d5be53aa778032280b90e256cf3b7c.tar.gz
pgfuse-481b1a4955d5be53aa778032280b90e256cf3b7c.tar.bz2
fixed some compilation issues on Centos 6
Diffstat (limited to 'pgsql.c')
-rw-r--r--pgsql.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/pgsql.c b/pgsql.c
index 613cc95..074f551 100644
--- a/pgsql.c
+++ b/pgsql.c
@@ -307,7 +307,7 @@ int psql_read_buf( PGconn *conn, const int id, const char *path, char *buf, cons
if( verbose ) {
syslog( LOG_DEBUG, "File '%s', reading block '%d', copied: '%d', DB block: '%d'",
- path, block_no, copied, db_block_no );
+ path, block_no, (unsigned int)copied, db_block_no );
}
}
@@ -315,7 +315,7 @@ int psql_read_buf( PGconn *conn, const int id, const char *path, char *buf, cons
if( copied != size ) {
syslog( LOG_ERR, "File '%s', reading block '%d', copied '%d' bytes but expecting '%d'!",
- path, block_no, copied, size );
+ path, block_no, (unsigned int)copied, size );
return -EIO;
}
@@ -482,7 +482,7 @@ update_again:
/* keep data on the right */
} else if( offset == 0 && len < STANDARD_BLOCK_SIZE ) {
- sprintf( sql, "UPDATE data set data = $3::bytea || substring( data from %d for %d ) WHERE dir_id=$1::int4 AND block_no=$2::int4",
+ sprintf( sql, "UPDATE data set data = $3::bytea || substring( data from %lu for %lu ) WHERE dir_id=$1::int4 AND block_no=$2::int4",
len + 1, STANDARD_BLOCK_SIZE - len );
/* keep data on the left */
@@ -494,7 +494,7 @@ update_again:
/* small in the middle write, keep data on both sides */
} else if( offset > 0 && offset + len < STANDARD_BLOCK_SIZE ) {
- sprintf( sql, "UPDATE data set data = substring( data from %d for %d ) || $3::bytea || substring( data from %d for %d ) WHERE dir_id=$1::int4 AND block_no=$2::int4",
+ sprintf( sql, "UPDATE data set data = substring( data from %d for %d ) || $3::bytea || substring( data from %lu for %lu ) WHERE dir_id=$1::int4 AND block_no=$2::int4",
1, (unsigned int)offset,
(unsigned int)offset + len + 1, STANDARD_BLOCK_SIZE - ( (unsigned int)offset + len ) );
@@ -507,7 +507,7 @@ update_again:
if( verbose ) {
syslog( LOG_DEBUG, "%s, block: %d, offset: %d, len: %d => %s\n",
- path, block_no, (unsigned int)offset, len, sql );
+ path, block_no, (unsigned int)offset, (unsigned int)len, sql );
}
res = PQexecParams( conn, sql, 3, NULL, values, lengths, binary, 1 );
@@ -577,7 +577,7 @@ int psql_write_buf( PGconn *conn, const int id, const char *path, const char *bu
}
if( res != info.from_len ) {
syslog( LOG_ERR, "Partial write in file '%s' in first block '%d' (%u instead of %u octets)",
- path, info.from_block, res, info.from_len );
+ path, info.from_block, res, (unsigned int)info.from_len );
return -EIO;
}
@@ -609,7 +609,7 @@ int psql_write_buf( PGconn *conn, const int id, const char *path, const char *bu
}
if( res != info.to_len ) {
syslog( LOG_ERR, "Partial write in file '%s' in last block '%d' (%u instead of %u octets)",
- path, block_no, res, info.to_len );
+ path, block_no, res, (unsigned int)info.to_len );
return -EIO;
}