46 lines
1.9 KiB
Diff
46 lines
1.9 KiB
Diff
From 351714c1b63743fdf526adacd9eb195c5f7692ea Mon Sep 17 00:00:00 2001
|
|
From: Mattias Ellert <mattias.ellert@physics.uu.se>
|
|
Date: Sat, 10 Jul 2021 07:03:50 +0200
|
|
Subject: [PATCH] Fix compilation failure on 32 bit (ix86/arm32)
|
|
|
|
src/XrdOfs/XrdOfs.cc:
|
|
error: format '%ld' expects argument of type 'long int',
|
|
but argument 4 has type 'off_t' {aka 'long long int'} [-Werror=format=]
|
|
|
|
src/XrdSfs/XrdSfsInterface.cc:
|
|
Type changed from ssize_t (32/64 bits) to off_t (64 bits)
|
|
Change cast from (long) to (long long) and format from %ld to %lld
|
|
---
|
|
src/XrdOfs/XrdOfs.cc | 2 +-
|
|
src/XrdSfs/XrdSfsInterface.cc | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/XrdOfs/XrdOfs.cc b/src/XrdOfs/XrdOfs.cc
|
|
index 4800e4d39..733447ea7 100644
|
|
--- a/src/XrdOfs/XrdOfs.cc
|
|
+++ b/src/XrdOfs/XrdOfs.cc
|
|
@@ -129,7 +129,7 @@ bool VerPgw(const char *buf, ssize_t off, size_t len, const uint32_t* csv,
|
|
if (!XrdOucPgrwUtils::csVer(dInfo, badoff, badlen))
|
|
{char eMsg[512];
|
|
int n;
|
|
- n=snprintf(eMsg,sizeof(eMsg),"Checksum error at offset %ld.",badoff);
|
|
+ n = snprintf(eMsg, sizeof(eMsg), "Checksum error at offset %lld.", (long long) badoff);
|
|
error.setErrInfo(EDOM, eMsg);
|
|
eMsg[n-1] = 0;
|
|
OfsEroute.Emsg(epname, eMsg, "aborted pgwrite to", oh->Name());
|
|
diff --git a/src/XrdSfs/XrdSfsInterface.cc b/src/XrdSfs/XrdSfsInterface.cc
|
|
index ca9b6239a..fca3ad8d3 100644
|
|
--- a/src/XrdSfs/XrdSfsInterface.cc
|
|
+++ b/src/XrdSfs/XrdSfsInterface.cc
|
|
@@ -143,7 +143,7 @@ XrdSfsXferSize XrdSfsFile::pgWrite(XrdSfsFileOffset offset,
|
|
|
|
if (!XrdOucPgrwUtils::csVer(dInfo, badoff, badlen))
|
|
{char eMsg[512];
|
|
- snprintf(eMsg, sizeof(eMsg),"Checksum error at offset %ld.",(long)badoff);
|
|
+ snprintf(eMsg, sizeof(eMsg), "Checksum error at offset %lld.", (long long) badoff);
|
|
error.setErrInfo(EDOM, eMsg);
|
|
return SFS_ERROR;
|
|
}
|
|
--
|
|
2.31.1
|
|
|