Fixes a 'deprecated conversion from string constant to 'char*'' warning.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37330 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -6,6 +6,8 @@
|
|||||||
* as long as it is accompanied by it's documentation and this copyright notice.
|
* as long as it is accompanied by it's documentation and this copyright notice.
|
||||||
* The software comes with no warranty, etc.
|
* The software comes with no warranty, etc.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#define ASSIGN_RESOURCES
|
#define ASSIGN_RESOURCES
|
||||||
#include "Common.h"
|
#include "Common.h"
|
||||||
|
|
||||||
@@ -88,7 +90,6 @@ read_resources(const char* appSignature)
|
|||||||
} else
|
} else
|
||||||
kFoundHelpFile = false;
|
kFoundHelpFile = false;
|
||||||
|
|
||||||
|
|
||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -99,7 +100,7 @@ size_to_string(off_t byteCount, char* name)
|
|||||||
struct {
|
struct {
|
||||||
off_t limit;
|
off_t limit;
|
||||||
float divisor;
|
float divisor;
|
||||||
char* format;
|
const char* format;
|
||||||
} scale[] = {
|
} scale[] = {
|
||||||
{ 0x100000, 1024.0, "%.2f KB" },
|
{ 0x100000, 1024.0, "%.2f KB" },
|
||||||
{ 0x40000000, 1048576.0, "%.2f MB" },
|
{ 0x40000000, 1048576.0, "%.2f MB" },
|
||||||
@@ -117,4 +118,3 @@ size_to_string(off_t byteCount, char* name)
|
|||||||
sprintf(name, scale[i].format, byteCount / scale[i].divisor);
|
sprintf(name, scale[i].format, byteCount / scale[i].divisor);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user