[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-18
From: |
Pawel Kot |
Subject: |
[SCM] libgnokii and core programs branch, master, updated. rel_0_6_29-181-gb765f13 |
Date: |
Sun, 13 Feb 2011 14:58:14 +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 b765f13dba9e76e544198624430e4790f78d3c7f (commit)
via a2ccba4b74602f48daefa0928c0238b18b4893a0 (commit)
via 716775eb5d262773cf0e365fb4d9f0261a9afd6d (commit)
via a5cae86fb70e43c134fcf20068b4b963d873733c (commit)
via df99ea89092a54076805e3ba74b7e5a9fd126b6d (commit)
from 3af1d368a175ccb56e98c60086adc7a248a399e6 (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=b765f13dba9e76e544198624430e4790f78d3c7f
commit b765f13dba9e76e544198624430e4790f78d3c7f
Author: Pawel Kot <address@hidden>
Date: Sun Feb 13 15:13:12 2011 +0100
Avoid compilation warnings:
libfunctions.c: In function âload_from_memoryâ:
libfunctions.c:96: warning: passing argument 1 of âgn_cfg_memory_readâ
from incompatible pointer type
../include/gnokii.h:271: note: expected âconst char **â but argument is
of type âchar **â
cfgreader.c: In function âget_locationsâ:
cfgreader.c:1100: warning: assignment from incompatible pointer type
gsm-mms.c: In function âgn_mms_dec_miscstringâ:
gsm-mms.c:315: warning: field width should have type âintâ, but
argument 3 has type âsize_tâ
gnokii.c: In function âshellâ:
gnokii.c:1175: warning: assignment from incompatible pointer type
gnokii-file.c: In function âputfileâ:
gnokii-file.c:423: warning: âerrorâ may be used uninitialized in this
function
gnokii-utils.c: In function âreadtextâ:
gnokii-utils.c:151: warning: format â%dâ expects type âintâ, but
argument 4 has type âlong unsigned intâ
diff --git a/common/cfgreader.c b/common/cfgreader.c
index 29ac7a7..fb2427d 100644
--- a/common/cfgreader.c
+++ b/common/cfgreader.c
@@ -1093,7 +1093,7 @@ static char **get_locations(int *retval)
while ((aux = strsep(&xdg_config_dirs, ":")) != NULL) {
xdg_config_dir[i++] = strdup(aux);
if (i >= xcd_size) {
- char *aux;
+ void *aux;
xcd_size *= 2;
aux = realloc(xdg_config_dir, xcd_size);
if (aux)
diff --git a/common/gsm-mms.c b/common/gsm-mms.c
index 3f9d513..f1e63b1 100644
--- a/common/gsm-mms.c
+++ b/common/gsm-mms.c
@@ -312,7 +312,7 @@ gn_error gn_mms_dec_miscstring(const unsigned char *source,
size_t source_len, u
/* A null terminated string */
*decoded_len = strlen(&source[i]);
}
- *dest_length = asprintf((char **) dest_buffer, "%*s",
*decoded_len, &source[i]);
+ *dest_length = asprintf((char **) dest_buffer, "%*s",
(int)*decoded_len, &source[i]);
}
(*decoded_len) += i;
diff --git a/common/libfunctions.c b/common/libfunctions.c
index 4546a38..3a82190 100644
--- a/common/libfunctions.c
+++ b/common/libfunctions.c
@@ -93,7 +93,7 @@ static gn_error load_from_file(const char *configfile, const
char *configname)
static gn_error load_from_memory(char **lines)
{
- return gn_cfg_memory_read(lines);
+ return gn_cfg_memory_read((const char **)lines);
}
static gn_error phoneprofile_load(const char *configname, gn_error error,
struct gn_statemachine **state)
diff --git a/gnokii/gnokii-file.c b/gnokii/gnokii-file.c
index 4c1fe90..e5a11f7 100644
--- a/gnokii/gnokii-file.c
+++ b/gnokii/gnokii-file.c
@@ -420,7 +420,7 @@ int putfile_usage(FILE *f, int exitval)
gn_error putfile(int argc, char *argv[], gn_data *data, struct gn_statemachine
*state)
{
gn_file fi;
- gn_error error;
+ gn_error error = GN_ERR_FAILED;
FILE *f;
if (argc != optind + 1)
@@ -435,7 +435,7 @@ gn_error putfile(int argc, char *argv[], gn_data *data,
struct gn_statemachine *
f = fopen(optarg, "rb");
if (!f || fseek(f, 0, SEEK_END)) {
fprintf(stderr, _("Can't open file %s for reading!\n"), optarg);
- return GN_ERR_FAILED;
+ goto err;
}
fi.file_length = ftell(f);
rewind(f);
@@ -452,5 +452,6 @@ out:
free(fi.file);
fclose(f);
+err:
return error;
}
diff --git a/gnokii/gnokii-utils.c b/gnokii/gnokii-utils.c
index cf7ee47..2700ac7 100644
--- a/gnokii/gnokii-utils.c
+++ b/gnokii/gnokii-utils.c
@@ -148,7 +148,7 @@ gn_error readtext(gn_sms_user_data *udata)
if (udata->type != GN_SMS_DATA_iMelody && chars_read > 0 &&
message_buffer[chars_read - 1] == '\n')
message_buffer[--chars_read] = 0;
if (chars_read > (sizeof(udata->u.text) - 1)) {
- fprintf(stderr, _("Input too long! (%d, maximum is %d)\n"),
chars_read, (sizeof(udata->u.text) - 1));
+ fprintf(stderr, _("Input too long! (%d, maximum is %d)\n"),
chars_read, (int)(sizeof(udata->u.text) - 1));
return GN_ERR_INTERNALERROR;
}
diff --git a/gnokii/gnokii.c b/gnokii/gnokii.c
index 418b950..7230ac0 100644
--- a/gnokii/gnokii.c
+++ b/gnokii/gnokii.c
@@ -1168,7 +1168,7 @@ int shell(gn_data *data, struct gn_statemachine *state)
break;
do {
if (argc >= size) {
- char *aux;
+ void *aux;
size += ARGV_CHUNK;
aux = realloc(argv, size * sizeof(char *));
if (aux)
http://git.savannah.gnu.org/cgit/gnokii.git/commit/?id=a2ccba4b74602f48daefa0928c0238b18b4893a0
commit b765f13dba9e76e544198624430e4790f78d3c7f
Author: Pawel Kot <address@hidden>
Date: Sun Feb 13 15:13:12 2011 +0100
Avoid compilation warnings:
libfunctions.c: In function âload_from_memoryâ:
libfunctions.c:96: warning: passing argument 1 of âgn_cfg_memory_readâ
from incompatible pointer type
../include/gnokii.h:271: note: expected âconst char **â but argument is
of type âchar **â
cfgreader.c: In function âget_locationsâ:
cfgreader.c:1100: warning: assignment from incompatible pointer type
gsm-mms.c: In function âgn_mms_dec_miscstringâ:
gsm-mms.c:315: warning: field width should have type âintâ, but
argument 3 has type âsize_tâ
gnokii.c: In function âshellâ:
gnokii.c:1175: warning: assignment from incompatible pointer type
gnokii-file.c: In function âputfileâ:
gnokii-file.c:423: warning: âerrorâ may be used uninitialized in this
function
gnokii-utils.c: In function âreadtextâ:
gnokii-utils.c:151: warning: format â%dâ expects type âintâ, but
argument 4 has type âlong unsigned intâ
diff --git a/common/cfgreader.c b/common/cfgreader.c
index 29ac7a7..fb2427d 100644
--- a/common/cfgreader.c
+++ b/common/cfgreader.c
@@ -1093,7 +1093,7 @@ static char **get_locations(int *retval)
while ((aux = strsep(&xdg_config_dirs, ":")) != NULL) {
xdg_config_dir[i++] = strdup(aux);
if (i >= xcd_size) {
- char *aux;
+ void *aux;
xcd_size *= 2;
aux = realloc(xdg_config_dir, xcd_size);
if (aux)
diff --git a/common/gsm-mms.c b/common/gsm-mms.c
index 3f9d513..f1e63b1 100644
--- a/common/gsm-mms.c
+++ b/common/gsm-mms.c
@@ -312,7 +312,7 @@ gn_error gn_mms_dec_miscstring(const unsigned char *source,
size_t source_len, u
/* A null terminated string */
*decoded_len = strlen(&source[i]);
}
- *dest_length = asprintf((char **) dest_buffer, "%*s",
*decoded_len, &source[i]);
+ *dest_length = asprintf((char **) dest_buffer, "%*s",
(int)*decoded_len, &source[i]);
}
(*decoded_len) += i;
diff --git a/common/libfunctions.c b/common/libfunctions.c
index 4546a38..3a82190 100644
--- a/common/libfunctions.c
+++ b/common/libfunctions.c
@@ -93,7 +93,7 @@ static gn_error load_from_file(const char *configfile, const
char *configname)
static gn_error load_from_memory(char **lines)
{
- return gn_cfg_memory_read(lines);
+ return gn_cfg_memory_read((const char **)lines);
}
static gn_error phoneprofile_load(const char *configname, gn_error error,
struct gn_statemachine **state)
diff --git a/gnokii/gnokii-file.c b/gnokii/gnokii-file.c
index 4c1fe90..e5a11f7 100644
--- a/gnokii/gnokii-file.c
+++ b/gnokii/gnokii-file.c
@@ -420,7 +420,7 @@ int putfile_usage(FILE *f, int exitval)
gn_error putfile(int argc, char *argv[], gn_data *data, struct gn_statemachine
*state)
{
gn_file fi;
- gn_error error;
+ gn_error error = GN_ERR_FAILED;
FILE *f;
if (argc != optind + 1)
@@ -435,7 +435,7 @@ gn_error putfile(int argc, char *argv[], gn_data *data,
struct gn_statemachine *
f = fopen(optarg, "rb");
if (!f || fseek(f, 0, SEEK_END)) {
fprintf(stderr, _("Can't open file %s for reading!\n"), optarg);
- return GN_ERR_FAILED;
+ goto err;
}
fi.file_length = ftell(f);
rewind(f);
@@ -452,5 +452,6 @@ out:
free(fi.file);
fclose(f);
+err:
return error;
}
diff --git a/gnokii/gnokii-utils.c b/gnokii/gnokii-utils.c
index cf7ee47..2700ac7 100644
--- a/gnokii/gnokii-utils.c
+++ b/gnokii/gnokii-utils.c
@@ -148,7 +148,7 @@ gn_error readtext(gn_sms_user_data *udata)
if (udata->type != GN_SMS_DATA_iMelody && chars_read > 0 &&
message_buffer[chars_read - 1] == '\n')
message_buffer[--chars_read] = 0;
if (chars_read > (sizeof(udata->u.text) - 1)) {
- fprintf(stderr, _("Input too long! (%d, maximum is %d)\n"),
chars_read, (sizeof(udata->u.text) - 1));
+ fprintf(stderr, _("Input too long! (%d, maximum is %d)\n"),
chars_read, (int)(sizeof(udata->u.text) - 1));
return GN_ERR_INTERNALERROR;
}
diff --git a/gnokii/gnokii.c b/gnokii/gnokii.c
index 418b950..7230ac0 100644
--- a/gnokii/gnokii.c
+++ b/gnokii/gnokii.c
@@ -1168,7 +1168,7 @@ int shell(gn_data *data, struct gn_statemachine *state)
break;
do {
if (argc >= size) {
- char *aux;
+ void *aux;
size += ARGV_CHUNK;
aux = realloc(argv, size * sizeof(char *));
if (aux)
http://git.savannah.gnu.org/cgit/gnokii.git/commit/?id=716775eb5d262773cf0e365fb4d9f0261a9afd6d
commit b765f13dba9e76e544198624430e4790f78d3c7f
Author: Pawel Kot <address@hidden>
Date: Sun Feb 13 15:13:12 2011 +0100
Avoid compilation warnings:
libfunctions.c: In function âload_from_memoryâ:
libfunctions.c:96: warning: passing argument 1 of âgn_cfg_memory_readâ
from incompatible pointer type
../include/gnokii.h:271: note: expected âconst char **â but argument is
of type âchar **â
cfgreader.c: In function âget_locationsâ:
cfgreader.c:1100: warning: assignment from incompatible pointer type
gsm-mms.c: In function âgn_mms_dec_miscstringâ:
gsm-mms.c:315: warning: field width should have type âintâ, but
argument 3 has type âsize_tâ
gnokii.c: In function âshellâ:
gnokii.c:1175: warning: assignment from incompatible pointer type
gnokii-file.c: In function âputfileâ:
gnokii-file.c:423: warning: âerrorâ may be used uninitialized in this
function
gnokii-utils.c: In function âreadtextâ:
gnokii-utils.c:151: warning: format â%dâ expects type âintâ, but
argument 4 has type âlong unsigned intâ
diff --git a/common/cfgreader.c b/common/cfgreader.c
index 29ac7a7..fb2427d 100644
--- a/common/cfgreader.c
+++ b/common/cfgreader.c
@@ -1093,7 +1093,7 @@ static char **get_locations(int *retval)
while ((aux = strsep(&xdg_config_dirs, ":")) != NULL) {
xdg_config_dir[i++] = strdup(aux);
if (i >= xcd_size) {
- char *aux;
+ void *aux;
xcd_size *= 2;
aux = realloc(xdg_config_dir, xcd_size);
if (aux)
diff --git a/common/gsm-mms.c b/common/gsm-mms.c
index 3f9d513..f1e63b1 100644
--- a/common/gsm-mms.c
+++ b/common/gsm-mms.c
@@ -312,7 +312,7 @@ gn_error gn_mms_dec_miscstring(const unsigned char *source,
size_t source_len, u
/* A null terminated string */
*decoded_len = strlen(&source[i]);
}
- *dest_length = asprintf((char **) dest_buffer, "%*s",
*decoded_len, &source[i]);
+ *dest_length = asprintf((char **) dest_buffer, "%*s",
(int)*decoded_len, &source[i]);
}
(*decoded_len) += i;
diff --git a/common/libfunctions.c b/common/libfunctions.c
index 4546a38..3a82190 100644
--- a/common/libfunctions.c
+++ b/common/libfunctions.c
@@ -93,7 +93,7 @@ static gn_error load_from_file(const char *configfile, const
char *configname)
static gn_error load_from_memory(char **lines)
{
- return gn_cfg_memory_read(lines);
+ return gn_cfg_memory_read((const char **)lines);
}
static gn_error phoneprofile_load(const char *configname, gn_error error,
struct gn_statemachine **state)
diff --git a/gnokii/gnokii-file.c b/gnokii/gnokii-file.c
index 4c1fe90..e5a11f7 100644
--- a/gnokii/gnokii-file.c
+++ b/gnokii/gnokii-file.c
@@ -420,7 +420,7 @@ int putfile_usage(FILE *f, int exitval)
gn_error putfile(int argc, char *argv[], gn_data *data, struct gn_statemachine
*state)
{
gn_file fi;
- gn_error error;
+ gn_error error = GN_ERR_FAILED;
FILE *f;
if (argc != optind + 1)
@@ -435,7 +435,7 @@ gn_error putfile(int argc, char *argv[], gn_data *data,
struct gn_statemachine *
f = fopen(optarg, "rb");
if (!f || fseek(f, 0, SEEK_END)) {
fprintf(stderr, _("Can't open file %s for reading!\n"), optarg);
- return GN_ERR_FAILED;
+ goto err;
}
fi.file_length = ftell(f);
rewind(f);
@@ -452,5 +452,6 @@ out:
free(fi.file);
fclose(f);
+err:
return error;
}
diff --git a/gnokii/gnokii-utils.c b/gnokii/gnokii-utils.c
index cf7ee47..2700ac7 100644
--- a/gnokii/gnokii-utils.c
+++ b/gnokii/gnokii-utils.c
@@ -148,7 +148,7 @@ gn_error readtext(gn_sms_user_data *udata)
if (udata->type != GN_SMS_DATA_iMelody && chars_read > 0 &&
message_buffer[chars_read - 1] == '\n')
message_buffer[--chars_read] = 0;
if (chars_read > (sizeof(udata->u.text) - 1)) {
- fprintf(stderr, _("Input too long! (%d, maximum is %d)\n"),
chars_read, (sizeof(udata->u.text) - 1));
+ fprintf(stderr, _("Input too long! (%d, maximum is %d)\n"),
chars_read, (int)(sizeof(udata->u.text) - 1));
return GN_ERR_INTERNALERROR;
}
diff --git a/gnokii/gnokii.c b/gnokii/gnokii.c
index 418b950..7230ac0 100644
--- a/gnokii/gnokii.c
+++ b/gnokii/gnokii.c
@@ -1168,7 +1168,7 @@ int shell(gn_data *data, struct gn_statemachine *state)
break;
do {
if (argc >= size) {
- char *aux;
+ void *aux;
size += ARGV_CHUNK;
aux = realloc(argv, size * sizeof(char *));
if (aux)
http://git.savannah.gnu.org/cgit/gnokii.git/commit/?id=a5cae86fb70e43c134fcf20068b4b963d873733c
commit b765f13dba9e76e544198624430e4790f78d3c7f
Author: Pawel Kot <address@hidden>
Date: Sun Feb 13 15:13:12 2011 +0100
Avoid compilation warnings:
libfunctions.c: In function âload_from_memoryâ:
libfunctions.c:96: warning: passing argument 1 of âgn_cfg_memory_readâ
from incompatible pointer type
../include/gnokii.h:271: note: expected âconst char **â but argument is
of type âchar **â
cfgreader.c: In function âget_locationsâ:
cfgreader.c:1100: warning: assignment from incompatible pointer type
gsm-mms.c: In function âgn_mms_dec_miscstringâ:
gsm-mms.c:315: warning: field width should have type âintâ, but
argument 3 has type âsize_tâ
gnokii.c: In function âshellâ:
gnokii.c:1175: warning: assignment from incompatible pointer type
gnokii-file.c: In function âputfileâ:
gnokii-file.c:423: warning: âerrorâ may be used uninitialized in this
function
gnokii-utils.c: In function âreadtextâ:
gnokii-utils.c:151: warning: format â%dâ expects type âintâ, but
argument 4 has type âlong unsigned intâ
diff --git a/common/cfgreader.c b/common/cfgreader.c
index 29ac7a7..fb2427d 100644
--- a/common/cfgreader.c
+++ b/common/cfgreader.c
@@ -1093,7 +1093,7 @@ static char **get_locations(int *retval)
while ((aux = strsep(&xdg_config_dirs, ":")) != NULL) {
xdg_config_dir[i++] = strdup(aux);
if (i >= xcd_size) {
- char *aux;
+ void *aux;
xcd_size *= 2;
aux = realloc(xdg_config_dir, xcd_size);
if (aux)
diff --git a/common/gsm-mms.c b/common/gsm-mms.c
index 3f9d513..f1e63b1 100644
--- a/common/gsm-mms.c
+++ b/common/gsm-mms.c
@@ -312,7 +312,7 @@ gn_error gn_mms_dec_miscstring(const unsigned char *source,
size_t source_len, u
/* A null terminated string */
*decoded_len = strlen(&source[i]);
}
- *dest_length = asprintf((char **) dest_buffer, "%*s",
*decoded_len, &source[i]);
+ *dest_length = asprintf((char **) dest_buffer, "%*s",
(int)*decoded_len, &source[i]);
}
(*decoded_len) += i;
diff --git a/common/libfunctions.c b/common/libfunctions.c
index 4546a38..3a82190 100644
--- a/common/libfunctions.c
+++ b/common/libfunctions.c
@@ -93,7 +93,7 @@ static gn_error load_from_file(const char *configfile, const
char *configname)
static gn_error load_from_memory(char **lines)
{
- return gn_cfg_memory_read(lines);
+ return gn_cfg_memory_read((const char **)lines);
}
static gn_error phoneprofile_load(const char *configname, gn_error error,
struct gn_statemachine **state)
diff --git a/gnokii/gnokii-file.c b/gnokii/gnokii-file.c
index 4c1fe90..e5a11f7 100644
--- a/gnokii/gnokii-file.c
+++ b/gnokii/gnokii-file.c
@@ -420,7 +420,7 @@ int putfile_usage(FILE *f, int exitval)
gn_error putfile(int argc, char *argv[], gn_data *data, struct gn_statemachine
*state)
{
gn_file fi;
- gn_error error;
+ gn_error error = GN_ERR_FAILED;
FILE *f;
if (argc != optind + 1)
@@ -435,7 +435,7 @@ gn_error putfile(int argc, char *argv[], gn_data *data,
struct gn_statemachine *
f = fopen(optarg, "rb");
if (!f || fseek(f, 0, SEEK_END)) {
fprintf(stderr, _("Can't open file %s for reading!\n"), optarg);
- return GN_ERR_FAILED;
+ goto err;
}
fi.file_length = ftell(f);
rewind(f);
@@ -452,5 +452,6 @@ out:
free(fi.file);
fclose(f);
+err:
return error;
}
diff --git a/gnokii/gnokii-utils.c b/gnokii/gnokii-utils.c
index cf7ee47..2700ac7 100644
--- a/gnokii/gnokii-utils.c
+++ b/gnokii/gnokii-utils.c
@@ -148,7 +148,7 @@ gn_error readtext(gn_sms_user_data *udata)
if (udata->type != GN_SMS_DATA_iMelody && chars_read > 0 &&
message_buffer[chars_read - 1] == '\n')
message_buffer[--chars_read] = 0;
if (chars_read > (sizeof(udata->u.text) - 1)) {
- fprintf(stderr, _("Input too long! (%d, maximum is %d)\n"),
chars_read, (sizeof(udata->u.text) - 1));
+ fprintf(stderr, _("Input too long! (%d, maximum is %d)\n"),
chars_read, (int)(sizeof(udata->u.text) - 1));
return GN_ERR_INTERNALERROR;
}
diff --git a/gnokii/gnokii.c b/gnokii/gnokii.c
index 418b950..7230ac0 100644
--- a/gnokii/gnokii.c
+++ b/gnokii/gnokii.c
@@ -1168,7 +1168,7 @@ int shell(gn_data *data, struct gn_statemachine *state)
break;
do {
if (argc >= size) {
- char *aux;
+ void *aux;
size += ARGV_CHUNK;
aux = realloc(argv, size * sizeof(char *));
if (aux)
http://git.savannah.gnu.org/cgit/gnokii.git/commit/?id=df99ea89092a54076805e3ba74b7e5a9fd126b6d
commit b765f13dba9e76e544198624430e4790f78d3c7f
Author: Pawel Kot <address@hidden>
Date: Sun Feb 13 15:13:12 2011 +0100
Avoid compilation warnings:
libfunctions.c: In function âload_from_memoryâ:
libfunctions.c:96: warning: passing argument 1 of âgn_cfg_memory_readâ
from incompatible pointer type
../include/gnokii.h:271: note: expected âconst char **â but argument is
of type âchar **â
cfgreader.c: In function âget_locationsâ:
cfgreader.c:1100: warning: assignment from incompatible pointer type
gsm-mms.c: In function âgn_mms_dec_miscstringâ:
gsm-mms.c:315: warning: field width should have type âintâ, but
argument 3 has type âsize_tâ
gnokii.c: In function âshellâ:
gnokii.c:1175: warning: assignment from incompatible pointer type
gnokii-file.c: In function âputfileâ:
gnokii-file.c:423: warning: âerrorâ may be used uninitialized in this
function
gnokii-utils.c: In function âreadtextâ:
gnokii-utils.c:151: warning: format â%dâ expects type âintâ, but
argument 4 has type âlong unsigned intâ
diff --git a/common/cfgreader.c b/common/cfgreader.c
index 29ac7a7..fb2427d 100644
--- a/common/cfgreader.c
+++ b/common/cfgreader.c
@@ -1093,7 +1093,7 @@ static char **get_locations(int *retval)
while ((aux = strsep(&xdg_config_dirs, ":")) != NULL) {
xdg_config_dir[i++] = strdup(aux);
if (i >= xcd_size) {
- char *aux;
+ void *aux;
xcd_size *= 2;
aux = realloc(xdg_config_dir, xcd_size);
if (aux)
diff --git a/common/gsm-mms.c b/common/gsm-mms.c
index 3f9d513..f1e63b1 100644
--- a/common/gsm-mms.c
+++ b/common/gsm-mms.c
@@ -312,7 +312,7 @@ gn_error gn_mms_dec_miscstring(const unsigned char *source,
size_t source_len, u
/* A null terminated string */
*decoded_len = strlen(&source[i]);
}
- *dest_length = asprintf((char **) dest_buffer, "%*s",
*decoded_len, &source[i]);
+ *dest_length = asprintf((char **) dest_buffer, "%*s",
(int)*decoded_len, &source[i]);
}
(*decoded_len) += i;
diff --git a/common/libfunctions.c b/common/libfunctions.c
index 4546a38..3a82190 100644
--- a/common/libfunctions.c
+++ b/common/libfunctions.c
@@ -93,7 +93,7 @@ static gn_error load_from_file(const char *configfile, const
char *configname)
static gn_error load_from_memory(char **lines)
{
- return gn_cfg_memory_read(lines);
+ return gn_cfg_memory_read((const char **)lines);
}
static gn_error phoneprofile_load(const char *configname, gn_error error,
struct gn_statemachine **state)
diff --git a/gnokii/gnokii-file.c b/gnokii/gnokii-file.c
index 4c1fe90..e5a11f7 100644
--- a/gnokii/gnokii-file.c
+++ b/gnokii/gnokii-file.c
@@ -420,7 +420,7 @@ int putfile_usage(FILE *f, int exitval)
gn_error putfile(int argc, char *argv[], gn_data *data, struct gn_statemachine
*state)
{
gn_file fi;
- gn_error error;
+ gn_error error = GN_ERR_FAILED;
FILE *f;
if (argc != optind + 1)
@@ -435,7 +435,7 @@ gn_error putfile(int argc, char *argv[], gn_data *data,
struct gn_statemachine *
f = fopen(optarg, "rb");
if (!f || fseek(f, 0, SEEK_END)) {
fprintf(stderr, _("Can't open file %s for reading!\n"), optarg);
- return GN_ERR_FAILED;
+ goto err;
}
fi.file_length = ftell(f);
rewind(f);
@@ -452,5 +452,6 @@ out:
free(fi.file);
fclose(f);
+err:
return error;
}
diff --git a/gnokii/gnokii-utils.c b/gnokii/gnokii-utils.c
index cf7ee47..2700ac7 100644
--- a/gnokii/gnokii-utils.c
+++ b/gnokii/gnokii-utils.c
@@ -148,7 +148,7 @@ gn_error readtext(gn_sms_user_data *udata)
if (udata->type != GN_SMS_DATA_iMelody && chars_read > 0 &&
message_buffer[chars_read - 1] == '\n')
message_buffer[--chars_read] = 0;
if (chars_read > (sizeof(udata->u.text) - 1)) {
- fprintf(stderr, _("Input too long! (%d, maximum is %d)\n"),
chars_read, (sizeof(udata->u.text) - 1));
+ fprintf(stderr, _("Input too long! (%d, maximum is %d)\n"),
chars_read, (int)(sizeof(udata->u.text) - 1));
return GN_ERR_INTERNALERROR;
}
diff --git a/gnokii/gnokii.c b/gnokii/gnokii.c
index 418b950..7230ac0 100644
--- a/gnokii/gnokii.c
+++ b/gnokii/gnokii.c
@@ -1168,7 +1168,7 @@ int shell(gn_data *data, struct gn_statemachine *state)
break;
do {
if (argc >= size) {
- char *aux;
+ void *aux;
size += ARGV_CHUNK;
aux = realloc(argv, size * sizeof(char *));
if (aux)
-----------------------------------------------------------------------
Summary of changes:
INSTALL | 8 ++++----
common/cfgreader.c | 2 +-
common/gsm-mms.c | 2 +-
common/libfunctions.c | 2 +-
common/links/fbus-phonet.c | 1 +
configure.in | 2 +-
gnokii/gnokii-file.c | 5 +++--
gnokii/gnokii-utils.c | 2 +-
gnokii/gnokii.c | 2 +-
po/LINGUAS | 12 +++---------
10 files changed, 17 insertions(+), 21 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-181-gb765f13,
Pawel Kot <=