[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] libgnokii and core programs branch, master, updated. rel_0_6_29-32
|
From: |
Pawel Kot |
|
Subject: |
[SCM] libgnokii and core programs branch, master, updated. rel_0_6_29-320-g690ca12 |
|
Date: |
Fri, 02 Dec 2011 14:24:28 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "libgnokii and core programs".
The branch, master has been updated
via 690ca1217f9f54ef0e610af38f6a95be16c0d367 (commit)
via 6923be273c2aa12500d85316c7c20869fe467359 (commit)
via 63ed21cf971f5b18095b5659790431782834291e (commit)
via 1c72b7ec030e550dda79124c71376ec18f2a0a58 (commit)
from 3775a230680aa824ef830cd7232b1d1a5c13f793 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/gnokii.git/commit/?id=690ca1217f9f54ef0e610af38f6a95be16c0d367
commit 690ca1217f9f54ef0e610af38f6a95be16c0d367
Author: Pawel Kot <address@hidden>
Date: Fri Dec 2 15:22:26 2011 +0100
MSVC is not C99 compliant. Therefore it does not support C99-style array
initializers:
gn_phonebook_entry fake_phonebook[] = {
{ .location = 1, .empty = false, .name = "Test 1", .number =
"1111", .subentries_count = 0 },
{ .location = 2, .empty = false, .name = "Test 2", .number =
"2222", .subentries_count = 0 },
{ .location = 3, .empty = true },
{ .location = 4, .empty = false, .name = "Test 4", .number =
"4444", .subentries_count = 0 },
};
Disable it for all non C99 compliant implementations.
diff --git a/common/phones/fake.c b/common/phones/fake.c
index 46853a0..eaa204b 100644
--- a/common/phones/fake.c
+++ b/common/phones/fake.c
@@ -63,12 +63,15 @@ gn_driver driver_fake = {
NULL
};
+#if __STDC_VERSION__ >= 199901L
+#define HAVE_FAKE_PHONEBOOK 1
gn_phonebook_entry fake_phonebook[] = {
{ .location = 1, .empty = false, .name = "Test 1", .number = "1111",
.subentries_count = 0 },
{ .location = 2, .empty = false, .name = "Test 2", .number = "2222",
.subentries_count = 0 },
{ .location = 3, .empty = true },
{ .location = 4, .empty = false, .name = "Test 4", .number = "4444",
.subentries_count = 0 },
};
+#endif
/* Initialise is the only function allowed to 'use' state */
static gn_error fake_initialise(struct gn_statemachine *state)
@@ -453,6 +456,7 @@ size_t fake_encode(at_charset charset, char *dst, size_t
dst_len, const char *sr
static gn_error fake_phonebookstatus(gn_data *data, struct gn_statemachine
*state)
{
+#if defined (HAVE_FAKE_PHONEBOOK)
int location, used, free;
for (location = 0, used = 0, free = 0; location <
sizeof(fake_phonebook) / sizeof(gn_phonebook_entry); location++) {
@@ -466,6 +470,9 @@ static gn_error fake_phonebookstatus(gn_data *data, struct
gn_statemachine *stat
data->memory_status->free = free;
return GN_ERR_NONE;
+#else
+ return GN_ERR_NOTIMPLEMENTED;
+#endif
}
static gn_error fake_writephonebook(gn_data *data, struct gn_statemachine
*state)
@@ -499,6 +506,7 @@ static gn_error fake_writephonebook(gn_data *data, struct
gn_statemachine *state
static gn_error fake_readphonebook(gn_data *data, struct gn_statemachine
*state)
{
+#if defined (HAVE_FAKE_PHONEBOOK)
gn_phonebook_entry *pe = data->phonebook_entry;
if (pe->location < 1 || pe->location > sizeof(fake_phonebook) /
sizeof(gn_phonebook_entry))
@@ -508,13 +516,16 @@ static gn_error fake_readphonebook(gn_data *data, struct
gn_statemachine *state)
#if 1
/* This is to emulate those phones that return error for empty
locations */
return GN_ERR_INVALIDLOCATION;
-# else
+#else
return GN_ERR_EMPTYLOCATION;
#endif
memcpy(pe, &fake_phonebook[pe->location - 1],
sizeof(gn_phonebook_entry));
return GN_ERR_NONE;
+#else
+ return GN_ERR_NOTIMPLEMENTED;
+#endif
}
static gn_error fake_functions(gn_operation op, gn_data *data, struct
gn_statemachine *state)
http://git.savannah.gnu.org/cgit/gnokii.git/commit/?id=6923be273c2aa12500d85316c7c20869fe467359
commit 690ca1217f9f54ef0e610af38f6a95be16c0d367
Author: Pawel Kot <address@hidden>
Date: Fri Dec 2 15:22:26 2011 +0100
MSVC is not C99 compliant. Therefore it does not support C99-style array
initializers:
gn_phonebook_entry fake_phonebook[] = {
{ .location = 1, .empty = false, .name = "Test 1", .number =
"1111", .subentries_count = 0 },
{ .location = 2, .empty = false, .name = "Test 2", .number =
"2222", .subentries_count = 0 },
{ .location = 3, .empty = true },
{ .location = 4, .empty = false, .name = "Test 4", .number =
"4444", .subentries_count = 0 },
};
Disable it for all non C99 compliant implementations.
diff --git a/common/phones/fake.c b/common/phones/fake.c
index 46853a0..eaa204b 100644
--- a/common/phones/fake.c
+++ b/common/phones/fake.c
@@ -63,12 +63,15 @@ gn_driver driver_fake = {
NULL
};
+#if __STDC_VERSION__ >= 199901L
+#define HAVE_FAKE_PHONEBOOK 1
gn_phonebook_entry fake_phonebook[] = {
{ .location = 1, .empty = false, .name = "Test 1", .number = "1111",
.subentries_count = 0 },
{ .location = 2, .empty = false, .name = "Test 2", .number = "2222",
.subentries_count = 0 },
{ .location = 3, .empty = true },
{ .location = 4, .empty = false, .name = "Test 4", .number = "4444",
.subentries_count = 0 },
};
+#endif
/* Initialise is the only function allowed to 'use' state */
static gn_error fake_initialise(struct gn_statemachine *state)
@@ -453,6 +456,7 @@ size_t fake_encode(at_charset charset, char *dst, size_t
dst_len, const char *sr
static gn_error fake_phonebookstatus(gn_data *data, struct gn_statemachine
*state)
{
+#if defined (HAVE_FAKE_PHONEBOOK)
int location, used, free;
for (location = 0, used = 0, free = 0; location <
sizeof(fake_phonebook) / sizeof(gn_phonebook_entry); location++) {
@@ -466,6 +470,9 @@ static gn_error fake_phonebookstatus(gn_data *data, struct
gn_statemachine *stat
data->memory_status->free = free;
return GN_ERR_NONE;
+#else
+ return GN_ERR_NOTIMPLEMENTED;
+#endif
}
static gn_error fake_writephonebook(gn_data *data, struct gn_statemachine
*state)
@@ -499,6 +506,7 @@ static gn_error fake_writephonebook(gn_data *data, struct
gn_statemachine *state
static gn_error fake_readphonebook(gn_data *data, struct gn_statemachine
*state)
{
+#if defined (HAVE_FAKE_PHONEBOOK)
gn_phonebook_entry *pe = data->phonebook_entry;
if (pe->location < 1 || pe->location > sizeof(fake_phonebook) /
sizeof(gn_phonebook_entry))
@@ -508,13 +516,16 @@ static gn_error fake_readphonebook(gn_data *data, struct
gn_statemachine *state)
#if 1
/* This is to emulate those phones that return error for empty
locations */
return GN_ERR_INVALIDLOCATION;
-# else
+#else
return GN_ERR_EMPTYLOCATION;
#endif
memcpy(pe, &fake_phonebook[pe->location - 1],
sizeof(gn_phonebook_entry));
return GN_ERR_NONE;
+#else
+ return GN_ERR_NOTIMPLEMENTED;
+#endif
}
static gn_error fake_functions(gn_operation op, gn_data *data, struct
gn_statemachine *state)
http://git.savannah.gnu.org/cgit/gnokii.git/commit/?id=63ed21cf971f5b18095b5659790431782834291e
commit 690ca1217f9f54ef0e610af38f6a95be16c0d367
Author: Pawel Kot <address@hidden>
Date: Fri Dec 2 15:22:26 2011 +0100
MSVC is not C99 compliant. Therefore it does not support C99-style array
initializers:
gn_phonebook_entry fake_phonebook[] = {
{ .location = 1, .empty = false, .name = "Test 1", .number =
"1111", .subentries_count = 0 },
{ .location = 2, .empty = false, .name = "Test 2", .number =
"2222", .subentries_count = 0 },
{ .location = 3, .empty = true },
{ .location = 4, .empty = false, .name = "Test 4", .number =
"4444", .subentries_count = 0 },
};
Disable it for all non C99 compliant implementations.
diff --git a/common/phones/fake.c b/common/phones/fake.c
index 46853a0..eaa204b 100644
--- a/common/phones/fake.c
+++ b/common/phones/fake.c
@@ -63,12 +63,15 @@ gn_driver driver_fake = {
NULL
};
+#if __STDC_VERSION__ >= 199901L
+#define HAVE_FAKE_PHONEBOOK 1
gn_phonebook_entry fake_phonebook[] = {
{ .location = 1, .empty = false, .name = "Test 1", .number = "1111",
.subentries_count = 0 },
{ .location = 2, .empty = false, .name = "Test 2", .number = "2222",
.subentries_count = 0 },
{ .location = 3, .empty = true },
{ .location = 4, .empty = false, .name = "Test 4", .number = "4444",
.subentries_count = 0 },
};
+#endif
/* Initialise is the only function allowed to 'use' state */
static gn_error fake_initialise(struct gn_statemachine *state)
@@ -453,6 +456,7 @@ size_t fake_encode(at_charset charset, char *dst, size_t
dst_len, const char *sr
static gn_error fake_phonebookstatus(gn_data *data, struct gn_statemachine
*state)
{
+#if defined (HAVE_FAKE_PHONEBOOK)
int location, used, free;
for (location = 0, used = 0, free = 0; location <
sizeof(fake_phonebook) / sizeof(gn_phonebook_entry); location++) {
@@ -466,6 +470,9 @@ static gn_error fake_phonebookstatus(gn_data *data, struct
gn_statemachine *stat
data->memory_status->free = free;
return GN_ERR_NONE;
+#else
+ return GN_ERR_NOTIMPLEMENTED;
+#endif
}
static gn_error fake_writephonebook(gn_data *data, struct gn_statemachine
*state)
@@ -499,6 +506,7 @@ static gn_error fake_writephonebook(gn_data *data, struct
gn_statemachine *state
static gn_error fake_readphonebook(gn_data *data, struct gn_statemachine
*state)
{
+#if defined (HAVE_FAKE_PHONEBOOK)
gn_phonebook_entry *pe = data->phonebook_entry;
if (pe->location < 1 || pe->location > sizeof(fake_phonebook) /
sizeof(gn_phonebook_entry))
@@ -508,13 +516,16 @@ static gn_error fake_readphonebook(gn_data *data, struct
gn_statemachine *state)
#if 1
/* This is to emulate those phones that return error for empty
locations */
return GN_ERR_INVALIDLOCATION;
-# else
+#else
return GN_ERR_EMPTYLOCATION;
#endif
memcpy(pe, &fake_phonebook[pe->location - 1],
sizeof(gn_phonebook_entry));
return GN_ERR_NONE;
+#else
+ return GN_ERR_NOTIMPLEMENTED;
+#endif
}
static gn_error fake_functions(gn_operation op, gn_data *data, struct
gn_statemachine *state)
http://git.savannah.gnu.org/cgit/gnokii.git/commit/?id=1c72b7ec030e550dda79124c71376ec18f2a0a58
commit 690ca1217f9f54ef0e610af38f6a95be16c0d367
Author: Pawel Kot <address@hidden>
Date: Fri Dec 2 15:22:26 2011 +0100
MSVC is not C99 compliant. Therefore it does not support C99-style array
initializers:
gn_phonebook_entry fake_phonebook[] = {
{ .location = 1, .empty = false, .name = "Test 1", .number =
"1111", .subentries_count = 0 },
{ .location = 2, .empty = false, .name = "Test 2", .number =
"2222", .subentries_count = 0 },
{ .location = 3, .empty = true },
{ .location = 4, .empty = false, .name = "Test 4", .number =
"4444", .subentries_count = 0 },
};
Disable it for all non C99 compliant implementations.
diff --git a/common/phones/fake.c b/common/phones/fake.c
index 46853a0..eaa204b 100644
--- a/common/phones/fake.c
+++ b/common/phones/fake.c
@@ -63,12 +63,15 @@ gn_driver driver_fake = {
NULL
};
+#if __STDC_VERSION__ >= 199901L
+#define HAVE_FAKE_PHONEBOOK 1
gn_phonebook_entry fake_phonebook[] = {
{ .location = 1, .empty = false, .name = "Test 1", .number = "1111",
.subentries_count = 0 },
{ .location = 2, .empty = false, .name = "Test 2", .number = "2222",
.subentries_count = 0 },
{ .location = 3, .empty = true },
{ .location = 4, .empty = false, .name = "Test 4", .number = "4444",
.subentries_count = 0 },
};
+#endif
/* Initialise is the only function allowed to 'use' state */
static gn_error fake_initialise(struct gn_statemachine *state)
@@ -453,6 +456,7 @@ size_t fake_encode(at_charset charset, char *dst, size_t
dst_len, const char *sr
static gn_error fake_phonebookstatus(gn_data *data, struct gn_statemachine
*state)
{
+#if defined (HAVE_FAKE_PHONEBOOK)
int location, used, free;
for (location = 0, used = 0, free = 0; location <
sizeof(fake_phonebook) / sizeof(gn_phonebook_entry); location++) {
@@ -466,6 +470,9 @@ static gn_error fake_phonebookstatus(gn_data *data, struct
gn_statemachine *stat
data->memory_status->free = free;
return GN_ERR_NONE;
+#else
+ return GN_ERR_NOTIMPLEMENTED;
+#endif
}
static gn_error fake_writephonebook(gn_data *data, struct gn_statemachine
*state)
@@ -499,6 +506,7 @@ static gn_error fake_writephonebook(gn_data *data, struct
gn_statemachine *state
static gn_error fake_readphonebook(gn_data *data, struct gn_statemachine
*state)
{
+#if defined (HAVE_FAKE_PHONEBOOK)
gn_phonebook_entry *pe = data->phonebook_entry;
if (pe->location < 1 || pe->location > sizeof(fake_phonebook) /
sizeof(gn_phonebook_entry))
@@ -508,13 +516,16 @@ static gn_error fake_readphonebook(gn_data *data, struct
gn_statemachine *state)
#if 1
/* This is to emulate those phones that return error for empty
locations */
return GN_ERR_INVALIDLOCATION;
-# else
+#else
return GN_ERR_EMPTYLOCATION;
#endif
memcpy(pe, &fake_phonebook[pe->location - 1],
sizeof(gn_phonebook_entry));
return GN_ERR_NONE;
+#else
+ return GN_ERR_NOTIMPLEMENTED;
+#endif
}
static gn_error fake_functions(gn_operation op, gn_data *data, struct
gn_statemachine *state)
-----------------------------------------------------------------------
Summary of changes:
Windows/MSVC2010Express/README | 27 +++++++++++++++------------
Windows/MSVC2010Express/config.h | 2 +-
Windows/MSVC6/config.h | 2 +-
Windows/MSVC8/config.h | 2 +-
Windows/MSVS2005/config.h | 2 +-
Windows/MSVS2008/config.h | 2 +-
Windows/MSVS2010/config.h | 2 +-
common/gsm-sms.c | 2 +-
common/phones/fake.c | 13 ++++++++++++-
9 files changed, 34 insertions(+), 20 deletions(-)
hooks/post-receive
--
libgnokii and core programs
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] libgnokii and core programs branch, master, updated. rel_0_6_29-320-g690ca12,
Pawel Kot <=