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

Added a couple of casts to take care of compile warnings

Browse Source 
Resolves issue #88

Specifying credentials on the command line is no longer
supported. There are several other ways to do this now.



git-svn-id: http://s3fs.googlecode.com/svn/trunk@243 df820570-a93a-0410-bd06-b72b767a4274
This commit is contained in:
mooredan@suncup.net 2010-11-21 01:30:25 +00:00
parent d239780a29
commit 7429227922
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
AC_INIT(s3fs, 1.14)
AC_INIT(s3fs, 1.15)
AC_CANONICAL_SYSTEM

20
src/s3fs.cpp
View File

@ -1667,7 +1667,7 @@ static void s3fs_check_service(void) {
}
curl_easy_getinfo(curl.get(), CURLINFO_RESPONSE_CODE, &responseCode);
if(debug) syslog(LOG_DEBUG, "responseCode: %i\n", responseCode);
if(debug) syslog(LOG_DEBUG, "responseCode: %i\n", (int)responseCode);
// Connection was made, but there is a HTTP error
if (curlCode == CURLE_HTTP_RETURNED_ERROR) {
@ -1677,13 +1677,13 @@ static void s3fs_check_service(void) {
exit(1);
}
fprintf (stderr, "%s: HTTP: %i - report this to the s3fs developers\n",
program_name.c_str(), responseCode);
program_name.c_str(), (int)responseCode);
exit(1);
}
// Success
if (responseCode != 200) {
if(debug) syslog(LOG_DEBUG, "responseCode: %i\n", responseCode);
if(debug) syslog(LOG_DEBUG, "responseCode: %i\n", (int)responseCode);
return;
}
@ -2016,10 +2016,6 @@ static void show_help (void) {
"\n"
" <option_name>=<option_value>\n"
"\n"
" accessKeyId\n"
" secretAccessKey\n"
" - command line over-rides of these settings\n"
"\n"
" default_acl (default=\"private\")\n"
" - the default canned acl to apply to all written s3 objects\n"
" see http://aws.amazon.com/documentation/s3/ for the \n"
@ -2148,12 +2144,14 @@ static int my_fuse_opt_proc(void *data, const char *arg, int key, struct fuse_ar
if (key == FUSE_OPT_KEY_OPT) {
if (strstr(arg, "accessKeyId=") != 0) {
AWSAccessKeyId = strchr(arg, '=') + 1;
return 0;
fprintf(stderr, "%s: option accessKeyId is no longer supported\n",
program_name.c_str());
exit(1);
}
if (strstr(arg, "secretAccessKey=") != 0) {
AWSSecretAccessKey = strchr(arg, '=') + 1;
return 0;
fprintf(stderr, "%s: option secretAccessKey is no longer supported\n",
program_name.c_str());
exit(1);
}
if (strstr(arg, "default_acl=") != 0) {
default_acl = strchr(arg, '=') + 1;