octoleo/s3fs-fuse
1
0
Fork 0
mirror of https://github.com/s3fs-fuse/s3fs-fuse.git synced 2024-11-16 01:07:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a bug(prototype and initializing enum)

Browse Source 
1) Fixed a bug
   Fixed bugs(mis-coding) which is wrong prototype for md5hexsum, md5sum functions.
     Issue 361: complie time error after running #make
     Issue 360: 1.72 Will not compile on Ubuntu 12.04.2 (precise) i686

   And fixed a code for initializing enum member in S3fsCurl class. 



git-svn-id: http://s3fs.googlecode.com/svn/trunk@469 df820570-a93a-0410-bd06-b72b767a4274
This commit is contained in:
ggtakec@gmail.com 2013-08-21 08:39:06 +00:00
parent 171de649ef
commit 2b3fb2d102
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/curl.cpp
View File

@ -892,10 +892,11 @@ int S3fsCurl::ParallelGetObjectRequest(const char* tpath, int fd, off_t start, s
// Methods for S3fsCurl // Methods for S3fsCurl
//------------------------------------------------------------------- //-------------------------------------------------------------------
S3fsCurl::S3fsCurl(bool ahbe) : S3fsCurl::S3fsCurl(bool ahbe) :
type(REQTYPE_UNSET), hCurl(NULL), path(""), base_path(""), saved_path(""), url(""), requestHeaders(NULL), hCurl(NULL), path(""), base_path(""), saved_path(""), url(""), requestHeaders(NULL),
bodydata(NULL), headdata(NULL), LastResponseCode(-1), postdata(NULL), postdata_remaining(0), is_use_ahbe(ahbe), bodydata(NULL), headdata(NULL), LastResponseCode(-1), postdata(NULL), postdata_remaining(0), is_use_ahbe(ahbe),
b_infile(NULL), b_postdata(NULL), b_postdata_remaining(0), b_partdata_startpos(0), b_partdata_size(0) b_infile(NULL), b_postdata(NULL), b_postdata_remaining(0), b_partdata_startpos(0), b_partdata_size(0)
{ {
type = REQTYPE_UNSET;
} }
S3fsCurl::~S3fsCurl() S3fsCurl::~S3fsCurl()
@ -3046,7 +3047,7 @@ string GetContentMD5(int fd)
return Signature; return Signature;
} }
unsigned char* md5hexsum(int fd, off_t start, off_t size) unsigned char* md5hexsum(int fd, off_t start, ssize_t size)
{ {
MD5_CTX c; MD5_CTX c;
char buf[512]; char buf[512];
@ -3085,7 +3086,7 @@ unsigned char* md5hexsum(int fd, off_t start, off_t size)
return result; return result;
} }
string md5sum(int fd, off_t start, off_t size) string md5sum(int fd, off_t start, ssize_t size)
{ {
char md5[2 * MD5_DIGEST_LENGTH + 1]; char md5[2 * MD5_DIGEST_LENGTH + 1];
char hexbuf[3]; char hexbuf[3];