summaryrefslogtreecommitdiffstats
path: root/qarsh_packet.c
diff options
context:
space:
mode:
authorNate Straz <nstraz@redhat.com>2006-11-16 04:17:02 +0000
committerNathan Straz <nstraz@redhat.com>2008-09-23 09:37:46 -0400
commit9fc82fc82e7248a598b8c8bedd86cecb3c10d1e9 (patch)
tree1234bdb063d6ae9feed841546cda5ed710409ec6 /qarsh_packet.c
parent5d90b7ceb5e0bd2fd41ded8ec706b04cacfc647c (diff)
downloadqarsh-9fc82fc82e7248a598b8c8bedd86cecb3c10d1e9.tar.gz
qarsh-9fc82fc82e7248a598b8c8bedd86cecb3c10d1e9.tar.xz
qarsh-9fc82fc82e7248a598b8c8bedd86cecb3c10d1e9.zip
Use off_t instead of size_t so we can transfer files larger than 2GB.
I changed all formats from %zd to %lld, but this adds a lot of warnings because off_t isn't the same as long long int to the compiler. I don't know if there is a way to avoid the warnings on all platforms.
Diffstat (limited to 'qarsh_packet.c')
-rw-r--r--qarsh_packet.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/qarsh_packet.c b/qarsh_packet.c
index 6e70e79..f3f6ebb 100644
--- a/qarsh_packet.c
+++ b/qarsh_packet.c
@@ -277,7 +277,7 @@ parse_qp_recvfile(xmlXPathContextPtr ctxt, struct qa_packet *qp)
free(s);
s = get_xpath_string(ctxt, "param[@name='count']");
- qp->qp_recvfile.qp_count = atoi(s);
+ qp->qp_recvfile.qp_count = atoll(s);
free(s);
s = get_xpath_string(ctxt, "param[@name='mode']");
@@ -496,7 +496,7 @@ void string_qp_recvfile(xmlNodePtr node, struct qa_packet *qp)
snprintf(tmpstr, 32, "%d", qp->qp_recvfile.qp_if_port);
xmlAddChild(node, make_param("if_port", tmpstr));
- snprintf(tmpstr, 32, "%zd", qp->qp_recvfile.qp_count);
+ snprintf(tmpstr, 32, "%lld", qp->qp_recvfile.qp_count);
xmlAddChild(node, make_param("count", tmpstr));
snprintf(tmpstr, 32, "%d", qp->qp_recvfile.qp_mode);
@@ -523,7 +523,7 @@ void string_qp_rstat(xmlNodePtr node, struct qa_packet *qp)
xmlAddChild(node, make_param("st_uid", tmpstr));
snprintf(tmpstr, 32, "%d", qp->qp_rstat.qp_st_gid);
xmlAddChild(node, make_param("st_gid", tmpstr));
- snprintf(tmpstr, 32, "%ld", qp->qp_rstat.qp_st_size);
+ snprintf(tmpstr, 32, "%lld", qp->qp_rstat.qp_st_size);
xmlAddChild(node, make_param("st_size", tmpstr));
}
@@ -669,7 +669,7 @@ make_qp_kill(int sig)
}
struct qa_packet *
-make_qp_recvfile(const char *path, int if_port, size_t count, mode_t mode)
+make_qp_recvfile(const char *path, int if_port, off_t count, mode_t mode)
{
struct qa_packet *qp;
qp = malloc(sizeof *qp);
@@ -831,7 +831,7 @@ dump_qp_recvfile(struct qa_packet *qp)
{
printf("\tpath: %s\n", qp->qp_recvfile.qp_path);
printf("\tif_port: %d\n", qp->qp_recvfile.qp_if_port);
- printf("\tcount: %zd\n", qp->qp_recvfile.qp_count);
+ printf("\tcount: %lld\n", qp->qp_recvfile.qp_count);
printf("\tmode: %o\n", qp->qp_recvfile.qp_mode);
}
@@ -849,7 +849,7 @@ dump_qp_rstat(struct qa_packet *qp)
printf("\tst_mode: %o\n", qp->qp_rstat.qp_st_mode);
printf("\tst_uid: %d\n", qp->qp_rstat.qp_st_uid);
printf("\tst_gid: %d\n", qp->qp_rstat.qp_st_gid);
- printf("\tst_size: %ld\n", qp->qp_rstat.qp_st_size);
+ printf("\tst_size: %lld\n", qp->qp_rstat.qp_st_size);
}
void