summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCyrille Bagard <nocbos@gmail.com>2015-01-05 21:21:59 (GMT)
committerCyrille Bagard <nocbos@gmail.com>2015-01-05 21:21:59 (GMT)
commitabec2acca0c300ab43e3fec73602e216c078b391 (patch)
treef2dc21158d5665cb409df475743226d59ae65a72 /src
parent639a993fd7400f95eb09ec69d89f227ef41b2865 (diff)
Ensured the right macro is used (XSTR vs STR).
git-svn-id: svn://svn.gna.org/svn/chrysalide/trunk@448 abbe820e-26c8-41b2-8c08-b7b2b41f8b0a
Diffstat (limited to 'src')
-rw-r--r--src/analysis/binary.c2
-rw-r--r--src/analysis/db/cdb.c4
-rw-r--r--src/arch/vmpa.c10
-rw-r--r--src/arch/vmpa.h2
-rw-r--r--src/common/xml.c2
-rw-r--r--src/dialogs/storage.c2
6 files changed, 11 insertions, 11 deletions
diff --git a/src/analysis/binary.c b/src/analysis/binary.c
index d7f89b1..0c7a71c 100644
--- a/src/analysis/binary.c
+++ b/src/analysis/binary.c
@@ -776,7 +776,7 @@ static bool g_loaded_binary_save_storage(const GLoadedBinary *binary, xmlDocPtr
bool result; /* Bilan à faire remonter */
char *storage_path; /* Partie "Enregistrement" */
char *access; /* Chemin d'accès à un élément */
- char port_str[sizeof(STR(USHRT_MAX)) + 1]; /* Version chaînée */
+ char port_str[sizeof(XSTR(USHRT_MAX)) + 1]; /* Version chaînée */
DBFeatures i; /* Boucle de parcours */
result = true;
diff --git a/src/analysis/db/cdb.c b/src/analysis/db/cdb.c
index 55d1b2d..24da20e 100644
--- a/src/analysis/db/cdb.c
+++ b/src/analysis/db/cdb.c
@@ -28,11 +28,11 @@
#include <archive_entry.h>
#include <errno.h>
#include <fcntl.h>
-#include <limits.h>
#include <malloc.h>
#include <poll.h>
#include <pthread.h>
#include <signal.h>
+#include <stdint.h>
#include <stdio.h>
#include <string.h>
#include <unistd.h>
@@ -599,7 +599,7 @@ int g_cdb_archive_compare_hash(const GCdbArchive *archive, const rle_string *has
static bool g_cdb_archive_create_xml_desc(GCdbArchive *archive, const rle_string *user)
{
bool result; /* Bilan à retourner */
- char tmp[sizeof(STR(ULLONG_MAX))]; /* Stockage temporaire */
+ char tmp[sizeof(XSTR(UINT32_MAX))]; /* Stockage temporaire */
result = create_new_xml_file(&archive->xdoc, &archive->context);
if (!result) return false;
diff --git a/src/arch/vmpa.c b/src/arch/vmpa.c
index 7d57909..fcc1e2f 100644
--- a/src/arch/vmpa.c
+++ b/src/arch/vmpa.c
@@ -356,23 +356,23 @@ char *vmpa2_phys_to_string(const vmpa2t *addr, MemoryDataSize msize, char buffer
switch (msize)
{
case MDS_8_BITS:
- ret = snprintf(buffer, VMPA_MAX_LEN,"0x%02" PRIx64, addr->physical);
+ ret = snprintf(buffer, VMPA_MAX_LEN,"0x%02" PRIx64, (uint64_t)addr->physical);
break;
case MDS_16_BITS:
- ret = snprintf(buffer, VMPA_MAX_LEN, "0x%04" PRIx64, addr->physical);
+ ret = snprintf(buffer, VMPA_MAX_LEN, "0x%04" PRIx64, (uint64_t)addr->physical);
break;
case MDS_32_BITS:
- ret = snprintf(buffer, VMPA_MAX_LEN, "0x%08" PRIx64, addr->physical);
+ ret = snprintf(buffer, VMPA_MAX_LEN, "0x%08" PRIx64, (uint64_t)addr->physical);
break;
case MDS_64_BITS:
- ret = snprintf(buffer, VMPA_MAX_LEN, "0x%016" PRIx64, addr->physical);
+ ret = snprintf(buffer, VMPA_MAX_LEN, "0x%016" PRIx64, (uint64_t)addr->physical);
break;
default:
- ret = snprintf(buffer, VMPA_MAX_LEN, "0x%" PRIx64, addr->physical);
+ ret = snprintf(buffer, VMPA_MAX_LEN, "0x%" PRIx64, (uint64_t)addr->physical);
break;
}
diff --git a/src/arch/vmpa.h b/src/arch/vmpa.h
index 96e8a56..54dbda9 100644
--- a/src/arch/vmpa.h
+++ b/src/arch/vmpa.h
@@ -42,7 +42,7 @@
/* Taille de la plus longue chaîne de représentation */
-#define VMPA_MAX_LEN (sizeof(STR(ULLONG_MAX)) + 1)
+#define VMPA_MAX_LEN (2 + sizeof(XSTR(UINT64_MAX)) + 1)
/* Constitution guidée de tampons pour impression */
#define VMPA_BUFFER(name) char name[VMPA_MAX_LEN]
diff --git a/src/common/xml.c b/src/common/xml.c
index 36171b3..d01ae9b 100644
--- a/src/common/xml.c
+++ b/src/common/xml.c
@@ -898,7 +898,7 @@ bool add_content_to_node(xmlDocPtr xdoc, xmlXPathContextPtr context, const char
bool add_uint_content_to_node(xmlDocPtr xdoc, xmlXPathContextPtr context, const char *path, unsigned int value)
{
xmlNodePtr node; /* Noeud à modifier */
- char content[sizeof(STR(UINT_MAX)) + 1];/* Valeur en chaîne */
+ char content[sizeof(XSTR(UINT_MAX)) + 1];/* Valeur en chaîne */
if (content == NULL) return true;
diff --git a/src/dialogs/storage.c b/src/dialogs/storage.c
index cffc2e2..e334f2d 100644
--- a/src/dialogs/storage.c
+++ b/src/dialogs/storage.c
@@ -409,7 +409,7 @@ static void load_storage_remote_server(GLoadedBinary *binary, GObject *ref)
{
const char *host; /* Hôte à contacter */
unsigned short port; /* Port de connexion */
- char port_str[sizeof(STR(USHRT_MAX)) + 1]; /* Version chaînée */
+ char port_str[sizeof(XSTR(USHRT_MAX)) + 1]; /* Version chaînée */
bool use_remote; /* Utilisation du serveur ? */
GtkEntry *entry; /* Zone de saisie de texte */
GtkToggleButton *checkbutton; /* Activation de la distance */