[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnokii/common cfgreader.c device.c gsm-api.c gs...
From: |
Helge Deller |
Subject: |
gnokii/common cfgreader.c device.c gsm-api.c gs... |
Date: |
Sun, 11 Jun 2006 16:39:48 +0000 |
CVSROOT: /sources/gnokii
Module name: gnokii
Changes by: Helge Deller <deller> 06/06/11 16:39:48
Modified files:
common : cfgreader.c device.c gsm-api.c gsm-bitmaps.c
gsm-call.c gsm-common.c gsm-encoding.c
gsm-error.c gsm-filetypes.c gsm-networks.c
gsm-ringtones.c gsm-sms.c gsm-statemachine.c
ldif.c libfunctions.c misc.c vcal.c vcard.c
Log message:
replaced usage of "API" with "GNOKII_API"
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnokii/common/cfgreader.c?cvsroot=gnokii&r1=1.71&r2=1.72
http://cvs.savannah.gnu.org/viewcvs/gnokii/common/device.c?cvsroot=gnokii&r1=1.40&r2=1.41
http://cvs.savannah.gnu.org/viewcvs/gnokii/common/gsm-api.c?cvsroot=gnokii&r1=1.68&r2=1.69
http://cvs.savannah.gnu.org/viewcvs/gnokii/common/gsm-bitmaps.c?cvsroot=gnokii&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/gnokii/common/gsm-call.c?cvsroot=gnokii&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnokii/common/gsm-common.c?cvsroot=gnokii&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/gnokii/common/gsm-encoding.c?cvsroot=gnokii&r1=1.66&r2=1.67
http://cvs.savannah.gnu.org/viewcvs/gnokii/common/gsm-error.c?cvsroot=gnokii&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/gnokii/common/gsm-filetypes.c?cvsroot=gnokii&r1=1.67&r2=1.68
http://cvs.savannah.gnu.org/viewcvs/gnokii/common/gsm-networks.c?cvsroot=gnokii&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/gnokii/common/gsm-ringtones.c?cvsroot=gnokii&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/gnokii/common/gsm-sms.c?cvsroot=gnokii&r1=1.148&r2=1.149
http://cvs.savannah.gnu.org/viewcvs/gnokii/common/gsm-statemachine.c?cvsroot=gnokii&r1=1.60&r2=1.61
http://cvs.savannah.gnu.org/viewcvs/gnokii/common/ldif.c?cvsroot=gnokii&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnokii/common/libfunctions.c?cvsroot=gnokii&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/gnokii/common/misc.c?cvsroot=gnokii&r1=1.110&r2=1.111
http://cvs.savannah.gnu.org/viewcvs/gnokii/common/vcal.c?cvsroot=gnokii&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnokii/common/vcard.c?cvsroot=gnokii&r1=1.17&r2=1.18
Patches:
Index: cfgreader.c
===================================================================
RCS file: /sources/gnokii/gnokii/common/cfgreader.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -b -r1.71 -r1.72
--- cfgreader.c 8 May 2006 19:32:25 -0000 1.71
+++ cfgreader.c 11 Jun 2006 16:39:48 -0000 1.72
@@ -1,6 +1,6 @@
/*
- $Id: cfgreader.c,v 1.71 2006/05/08 19:32:25 deller Exp $
+ $Id: cfgreader.c,v 1.72 2006/06/11 16:39:48 deller Exp $
G N O K I I
@@ -51,7 +51,7 @@
#include "cfgreader.h"
#include "gnokii-internal.h"
-API struct gn_cfg_header *gn_cfg_info;
+GNOKII_API struct gn_cfg_header *gn_cfg_info;
static gn_config gn_config_default, gn_config_global;
struct gn_cfg_header *cfg_memory_read(const char **lines)
@@ -183,7 +183,7 @@
return cfg_head;
}
-API void gn_cfg_free_default()
+GNOKII_API void gn_cfg_free_default()
{
while (gn_cfg_info) {
struct gn_cfg_header *next;
@@ -319,7 +319,7 @@
* Find the value of a key in a config file. Return value associated
* with key or NULL if no such key exists.
*/
-API char *gn_cfg_get(struct gn_cfg_header *cfg, const char *section, const
char *key)
+GNOKII_API char *gn_cfg_get(struct gn_cfg_header *cfg, const char *section,
const char *key)
{
struct gn_cfg_header *h;
struct gn_cfg_entry *e;
@@ -560,7 +560,7 @@
}
#define MAX_PATH_LEN 200
-API int gn_cfg_read_default()
+GNOKII_API int gn_cfg_read_default()
{
char *homedir;
char rcfile[MAX_PATH_LEN];
@@ -593,7 +593,7 @@
}
/* DEPRECATED */
-API int gn_cfg_read(char **bindir)
+GNOKII_API int gn_cfg_read(char **bindir)
{
int retval;
@@ -674,17 +674,17 @@
return 0;
}
-API int gn_cfg_file_read(const char *file)
+GNOKII_API int gn_cfg_file_read(const char *file)
{
return cfg_file_or_memory_read(file, NULL);
}
-API int gn_cfg_memory_read(const char **lines)
+GNOKII_API int gn_cfg_memory_read(const char **lines)
{
return cfg_file_or_memory_read(NULL, lines);
}
-API int gn_cfg_phone_load(const char *iname, struct gn_statemachine *state)
+GNOKII_API int gn_cfg_phone_load(const char *iname, struct gn_statemachine
*state)
{
char section[256];
Index: device.c
===================================================================
RCS file: /sources/gnokii/gnokii/common/device.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- device.c 22 May 2006 20:00:43 -0000 1.40
+++ device.c 11 Jun 2006 16:39:48 -0000 1.41
@@ -1,6 +1,6 @@
/*
- $Id: device.c,v 1.40 2006/05/22 20:00:43 pkot Exp $
+ $Id: device.c,v 1.41 2006/06/11 16:39:48 deller Exp $
G N O K I I
@@ -47,7 +47,7 @@
#include "devices/dku2libusb.h"
-API int device_getfd(struct gn_statemachine *state)
+GNOKII_API int device_getfd(struct gn_statemachine *state)
{
return state->device.fd;
}
Index: gsm-api.c
===================================================================
RCS file: /sources/gnokii/gnokii/common/gsm-api.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- gsm-api.c 20 Apr 2005 22:33:36 -0000 1.68
+++ gsm-api.c 11 Jun 2006 16:39:48 -0000 1.69
@@ -1,6 +1,6 @@
/*
- $Id: gsm-api.c,v 1.68 2005/04/20 22:33:36 pkot Exp $
+ $Id: gsm-api.c,v 1.69 2006/06/11 16:39:48 deller Exp $
G N O K I I
@@ -92,7 +92,7 @@
/* Define pointer to the gn_phone structure used by external code to
obtain information that varies from model to model. This structure is also
defined in gsm-common.h */
-API gn_phone *gn_gsm_info;
+GNOKII_API gn_phone *gn_gsm_info;
/* Initialise interface to the phone. Model number should be a string such as
3810, 5110, 6110 etc. Device is the serial port to use e.g. /dev/ttyS0, the
@@ -123,7 +123,7 @@
return ret; \
}
-API gn_error gn_gsm_initialise(struct gn_statemachine *sm)
+GNOKII_API gn_error gn_gsm_initialise(struct gn_statemachine *sm)
{
gn_error ret;
Index: gsm-bitmaps.c
===================================================================
RCS file: /sources/gnokii/gnokii/common/gsm-bitmaps.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- gsm-bitmaps.c 20 Apr 2005 22:33:36 -0000 1.42
+++ gsm-bitmaps.c 11 Jun 2006 16:39:48 -0000 1.43
@@ -1,6 +1,6 @@
/*
- $Id: gsm-bitmaps.c,v 1.42 2005/04/20 22:33:36 pkot Exp $
+ $Id: gsm-bitmaps.c,v 1.43 2006/06/11 16:39:48 deller Exp $
G N O K I I
@@ -48,7 +48,7 @@
/* A few useful functions for bitmaps */
-API gn_error gn_bmp_null(gn_bmp *bmp, gn_phone *info)
+GNOKII_API gn_error gn_bmp_null(gn_bmp *bmp, gn_phone *info)
{
if (!bmp || !info) return GN_ERR_INTERNALERROR;
strcpy(bmp->netcode, "000 00");
@@ -59,7 +59,7 @@
return GN_ERR_NONE;
}
-API void gn_bmp_point_set(gn_bmp *bmp, int x, int y)
+GNOKII_API void gn_bmp_point_set(gn_bmp *bmp, int x, int y)
{
switch (bmp->type) {
case GN_BMP_NewOperatorLogo:
@@ -81,7 +81,7 @@
}
}
-API void gn_bmp_point_clear(gn_bmp *bmp, int x, int y)
+GNOKII_API void gn_bmp_point_clear(gn_bmp *bmp, int x, int y)
{
switch (bmp->type) {
case GN_BMP_StartupLogo:
@@ -103,7 +103,7 @@
}
}
-API bool gn_bmp_point(gn_bmp *bmp, int x, int y)
+GNOKII_API bool gn_bmp_point(gn_bmp *bmp, int x, int y)
{
int i = 0;
@@ -127,12 +127,12 @@
return ((i == 0) ? false : true);
}
-API void gn_bmp_clear(gn_bmp *bmp)
+GNOKII_API void gn_bmp_clear(gn_bmp *bmp)
{
if (bmp) memset(bmp->bitmap, 0, (bmp->size > GN_BMP_MAX_SIZE) ?
GN_BMP_MAX_SIZE : bmp->size);
}
-API void gn_bmp_resize(gn_bmp *bitmap, gn_bmp_types target, gn_phone *info)
+GNOKII_API void gn_bmp_resize(gn_bmp *bitmap, gn_bmp_types target, gn_phone
*info)
{
gn_bmp backup;
int x, y, copywidth, copyheight;
@@ -195,7 +195,7 @@
}
}
-API void gn_bmp_print(gn_bmp *bitmap, FILE *f)
+GNOKII_API void gn_bmp_print(gn_bmp *bitmap, FILE *f)
{
int x, y;
@@ -212,7 +212,7 @@
}
-API gn_error gn_bmp_sms_read(int type, unsigned char *message, unsigned char
*code, gn_bmp *bitmap)
+GNOKII_API gn_error gn_bmp_sms_read(int type, unsigned char *message, unsigned
char *code, gn_bmp *bitmap)
{
int offset = 0;
@@ -251,7 +251,7 @@
/* Returns message length */
-API int gn_bmp_sms_encode(gn_bmp *bitmap, unsigned char *message)
+GNOKII_API int gn_bmp_sms_encode(gn_bmp *bitmap, unsigned char *message)
{
unsigned int current = 0;
Index: gsm-call.c
===================================================================
RCS file: /sources/gnokii/gnokii/common/gsm-call.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- gsm-call.c 20 Apr 2005 22:33:36 -0000 1.13
+++ gsm-call.c 11 Jun 2006 16:39:48 -0000 1.14
@@ -1,6 +1,6 @@
/*
- $Id: gsm-call.c,v 1.13 2005/04/20 22:33:36 pkot Exp $
+ $Id: gsm-call.c,v 1.14 2006/06/11 16:39:48 deller Exp $
G N O K I I
@@ -46,7 +46,7 @@
return NULL;
}
-API void gn_call_notifier(gn_call_status call_status, gn_call_info *call_info,
struct gn_statemachine *state)
+GNOKII_API void gn_call_notifier(gn_call_status call_status, gn_call_info
*call_info, struct gn_statemachine *state)
{
gn_call *call;
@@ -112,7 +112,7 @@
}
}
-API gn_error gn_call_dial(int *call_id, gn_data *data, struct gn_statemachine
*state)
+GNOKII_API gn_error gn_call_dial(int *call_id, gn_data *data, struct
gn_statemachine *state)
{
gn_call *call;
gn_error err;
@@ -141,7 +141,7 @@
return GN_ERR_NONE;
}
-API gn_error gn_call_answer(int call_id)
+GNOKII_API gn_error gn_call_answer(int call_id)
{
gn_data data;
gn_call_info call_info;
@@ -156,7 +156,7 @@
return gn_sm_functions(GN_OP_AnswerCall, &data,
calltable[call_id].state);
}
-API gn_error gn_call_cancel(int call_id)
+GNOKII_API gn_error gn_call_cancel(int call_id)
{
gn_data data;
gn_call_info call_info;
@@ -171,14 +171,14 @@
return gn_sm_functions(GN_OP_AnswerCall, &data,
calltable[call_id].state);
}
-API gn_call *gn_call_get_active(int call_id)
+GNOKII_API gn_call *gn_call_get_active(int call_id)
{
if (calltable[call_id].status == GN_CALL_Idle) return NULL;
return calltable + call_id;
}
-API gn_error gn_call_check_active(struct gn_statemachine *state)
+GNOKII_API gn_error gn_call_check_active(struct gn_statemachine *state)
{
gn_data data;
gn_call_active active[2];
Index: gsm-common.c
===================================================================
RCS file: /sources/gnokii/gnokii/common/gsm-common.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- gsm-common.c 7 May 2006 20:44:58 -0000 1.23
+++ gsm-common.c 11 Jun 2006 16:39:48 -0000 1.24
@@ -1,6 +1,6 @@
/*
- $Id: gsm-common.c,v 1.23 2006/05/07 20:44:58 deller Exp $
+ $Id: gsm-common.c,v 1.24 2006/06/11 16:39:48 deller Exp $
G N O K I I
@@ -39,7 +39,7 @@
return GN_ERR_NOTIMPLEMENTED;
}
-API gn_memory_type gn_str2memory_type(const char *s)
+GNOKII_API gn_memory_type gn_str2memory_type(const char *s)
{
#define X(a) if (!strcmp(s, #a)) return GN_MT_##a;
X(ME);
@@ -80,7 +80,7 @@
#undef X
}
-API const char *gn_memory_type2str(gn_memory_type mt)
+GNOKII_API const char *gn_memory_type2str(gn_memory_type mt)
{
switch (mt) {
case GN_MT_ME: return _("Internal memory");
@@ -131,7 +131,7 @@
* Use this function to sanitize GSM phone number format. It changes
* number argument.
*/
-API void gn_number_sanitize(char *number, int maxlen)
+GNOKII_API void gn_number_sanitize(char *number, int maxlen)
{
char *iter, *e;
@@ -156,7 +156,7 @@
*
* Use this function before any attempt to write an entry to the phone.
*/
-API void gn_phonebook_entry_sanitize(gn_phonebook_entry *entry)
+GNOKII_API void gn_phonebook_entry_sanitize(gn_phonebook_entry *entry)
{
int i;
@@ -171,7 +171,7 @@
* This very small function is just to make it easier to clear
* the data struct every time one is created
*/
-API void gn_data_clear(gn_data *data)
+GNOKII_API void gn_data_clear(gn_data *data)
{
memset(data, 0, sizeof(gn_data));
}
Index: gsm-encoding.c
===================================================================
RCS file: /sources/gnokii/gnokii/common/gsm-encoding.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- gsm-encoding.c 8 May 2006 19:30:15 -0000 1.66
+++ gsm-encoding.c 11 Jun 2006 16:39:48 -0000 1.67
@@ -1,6 +1,6 @@
/*
- $Id: gsm-encoding.c,v 1.66 2006/05/08 19:30:15 pkot Exp $
+ $Id: gsm-encoding.c,v 1.67 2006/06/11 16:39:48 deller Exp $
G N O K I I
@@ -122,7 +122,7 @@
return codeset;
}
-API const char *gn_char_get_encoding()
+GNOKII_API const char *gn_char_get_encoding()
{
if (*application_encoding)
return application_encoding; /* app has overriden encoding
setting */
@@ -246,7 +246,7 @@
}
}
-API bool gn_char_def_alphabet(unsigned char *string)
+GNOKII_API bool gn_char_def_alphabet(unsigned char *string)
{
unsigned int i, len = strlen(string);
Index: gsm-error.c
===================================================================
RCS file: /sources/gnokii/gnokii/common/gsm-error.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- gsm-error.c 15 Jan 2006 15:13:26 -0000 1.23
+++ gsm-error.c 11 Jun 2006 16:39:48 -0000 1.24
@@ -1,6 +1,6 @@
/*
- $Id: gsm-error.c,v 1.23 2006/01/15 15:13:26 dforsi Exp $
+ $Id: gsm-error.c,v 1.24 2006/06/11 16:39:48 deller Exp $
G N O K I I
@@ -36,7 +36,7 @@
#include "misc.h"
#include "gnokii.h"
-API char *gn_error_print(gn_error e)
+GNOKII_API char *gn_error_print(gn_error e)
{
switch (e) {
case GN_ERR_NONE: return _("No error.");
Index: gsm-filetypes.c
===================================================================
RCS file: /sources/gnokii/gnokii/common/gsm-filetypes.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -b -r1.67 -r1.68
--- gsm-filetypes.c 22 May 2006 20:06:16 -0000 1.67
+++ gsm-filetypes.c 11 Jun 2006 16:39:48 -0000 1.68
@@ -1,6 +1,6 @@
/*
- $Id: gsm-filetypes.c,v 1.67 2006/05/22 20:06:16 pkot Exp $
+ $Id: gsm-filetypes.c,v 1.68 2006/06/11 16:39:48 deller Exp $
G N O K I I
@@ -1434,7 +1434,7 @@
#define GET_NEXT_TOKEN() o = get_next_token(line + offset, ';')
#define STORE_TOKEN(a) strip_slashes(a, line + offset, sizeof(a) - 1,
o - 1)
-API gn_error gn_file_phonebook_raw_parse(gn_phonebook_entry *entry, char *line)
+GNOKII_API gn_error gn_file_phonebook_raw_parse(gn_phonebook_entry *entry,
char *line)
{
char backline[MAX_INPUT_LINE_LEN];
char memory_type_char[3];
@@ -1644,7 +1644,7 @@
return error;
}
-API gn_error gn_file_phonebook_raw_write(FILE *f, gn_phonebook_entry *entry,
char *memory_type_string)
+GNOKII_API gn_error gn_file_phonebook_raw_write(FILE *f, gn_phonebook_entry
*entry, char *memory_type_string)
{
char escaped_name[2 * GN_PHONEBOOK_NAME_MAX_LENGTH];
int i;
Index: gsm-networks.c
===================================================================
RCS file: /sources/gnokii/gnokii/common/gsm-networks.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- gsm-networks.c 22 Aug 2005 23:39:11 -0000 1.42
+++ gsm-networks.c 11 Jun 2006 16:39:48 -0000 1.43
@@ -1,6 +1,6 @@
/*
- $Id: gsm-networks.c,v 1.42 2005/08/22 23:39:11 bozo Exp $
+ $Id: gsm-networks.c,v 1.43 2006/06/11 16:39:48 deller Exp $
G N O K I I
@@ -784,7 +784,7 @@
{ NULL, NULL }
};
-API char *gn_network_name_get(char *network_code)
+GNOKII_API char *gn_network_name_get(char *network_code)
{
int index = 0;
@@ -795,7 +795,7 @@
return networks[index].name ? networks[index].name : _("unknown");
}
-API char *gn_network_code_get(char *network_name)
+GNOKII_API char *gn_network_code_get(char *network_name)
{
int index = 0;
@@ -805,7 +805,7 @@
return networks[index].code ? networks[index].code : _("undefined");
}
-API char *gn_network_code_find(char *network_name, char *country_name)
+GNOKII_API char *gn_network_code_find(char *network_name, char *country_name)
{
int index = 0;
char country_code[5];
@@ -819,7 +819,7 @@
return networks[index].code ? networks[index].code : _("undefined");
}
-API char *gn_country_name_get(char *country_code)
+GNOKII_API char *gn_country_name_get(char *country_code)
{
int index = 0;
@@ -829,7 +829,7 @@
return countries[index].name ? countries[index].name : _("unknown");
}
-API char *gn_country_code_get(char *country_name)
+GNOKII_API char *gn_country_code_get(char *country_name)
{
int index = 0;
@@ -839,7 +839,7 @@
return countries[index].code ? countries[index].code : _("undefined");
}
-API bool gn_network_get(gn_network *network, int index)
+GNOKII_API bool gn_network_get(gn_network *network, int index)
{
if (index < 0 || index >= ARRAY_LEN(networks) - 1)
return false;
@@ -847,7 +847,7 @@
return true;
}
-API bool gn_country_get(gn_country *country, int index)
+GNOKII_API bool gn_country_get(gn_country *country, int index)
{
if (index < 0 || index >= ARRAY_LEN(countries) - 1)
return false;
@@ -855,7 +855,7 @@
return true;
}
-API char *gn_network2country(char *network_code)
+GNOKII_API char *gn_network2country(char *network_code)
{
char ccode[4];
Index: gsm-ringtones.c
===================================================================
RCS file: /sources/gnokii/gnokii/common/gsm-ringtones.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- gsm-ringtones.c 20 Apr 2005 22:33:36 -0000 1.25
+++ gsm-ringtones.c 11 Jun 2006 16:39:48 -0000 1.26
@@ -1,6 +1,6 @@
/*
- $Id: gsm-ringtones.c,v 1.25 2005/04/20 22:33:36 pkot Exp $
+ $Id: gsm-ringtones.c,v 1.26 2006/06/11 16:39:48 deller Exp $
G N O K I I
@@ -193,7 +193,7 @@
}
-API int gn_note_get(int number)
+GNOKII_API int gn_note_get(int number)
{
int note = 0;
@@ -253,7 +253,7 @@
Function returns number of packed notes and changes maxlength to
number of used chars in "package" */
-API unsigned char gn_ringtone_pack(gn_ringtone *ringtone, unsigned char
*package, int *maxlength)
+GNOKII_API unsigned char gn_ringtone_pack(gn_ringtone *ringtone, unsigned char
*package, int *maxlength)
{
int StartBit=0;
int i;
@@ -414,7 +414,7 @@
/* TODO: better checking, if contents of ringtone is OK */
-API gn_error gn_ringtone_unpack(gn_ringtone *ringtone, unsigned char *package,
int maxlength)
+GNOKII_API gn_error gn_ringtone_unpack(gn_ringtone *ringtone, unsigned char
*package, int maxlength)
{
int StartBit = 0;
int spec, duration, scale;
@@ -602,7 +602,7 @@
return (current + strlen(imelody));
}
-API void gn_ringtone_get_tone(const gn_ringtone *ringtone, int n, int *freq,
int *ulen)
+GNOKII_API void gn_ringtone_get_tone(const gn_ringtone *ringtone, int n, int
*freq, int *ulen)
{
float f;
@@ -641,7 +641,7 @@
*ulen = 1875000 * ringtone->notes[n].duration / ringtone->tempo;
}
-API void gn_ringtone_set_duration(gn_ringtone *ringtone, int n, int ulen)
+GNOKII_API void gn_ringtone_set_duration(gn_ringtone *ringtone, int n, int
ulen)
{
int l = ulen * ringtone->tempo / 240;
gn_ringtone_note *note = ringtone->notes + n;
Index: gsm-sms.c
===================================================================
RCS file: /sources/gnokii/gnokii/common/gsm-sms.c,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -b -r1.148 -r1.149
--- gsm-sms.c 4 May 2006 21:31:59 -0000 1.148
+++ gsm-sms.c 11 Jun 2006 16:39:48 -0000 1.149
@@ -1,6 +1,6 @@
/*
- $Id: gsm-sms.c,v 1.148 2006/05/04 21:31:59 pkot Exp $
+ $Id: gsm-sms.c,v 1.149 2006/06/11 16:39:48 deller Exp $
G N O K I I
@@ -111,14 +111,14 @@
sms->dcs.u.general.m_class = 0;
}
-API void gn_sms_default_submit(gn_sms *sms)
+GNOKII_API void gn_sms_default_submit(gn_sms *sms)
{
sms_default(sms);
sms->type = GN_SMS_MT_Submit;
sms->memory_type = GN_MT_SM;
}
-API void gn_sms_default_deliver(gn_sms *sms)
+GNOKII_API void gn_sms_default_deliver(gn_sms *sms)
{
sms_default(sms);
sms->type = GN_SMS_MT_Deliver;
@@ -698,7 +698,7 @@
* the highlevel SMS. In data->raw_sms there's SMS read by the phone
* driver, data->sms is the place for the parsed SMS.
*/
-API gn_error gn_sms_parse(gn_data *data)
+GNOKII_API gn_error gn_sms_parse(gn_data *data)
{
if (!data->raw_sms || !data->sms) return GN_ERR_INTERNALERROR;
/* Let's assume at the moment that all messages are PDU coded */
@@ -714,7 +714,7 @@
* phone driver. Not that raw_sms field in the gn_data structure must
* be initialized
*/
-API gn_error gn_sms_request(gn_data *data, struct gn_statemachine *state)
+GNOKII_API gn_error gn_sms_request(gn_data *data, struct gn_statemachine
*state)
{
if (!data->raw_sms) return GN_ERR_INTERNALERROR;
return gn_sm_functions(GN_OP_GetSMS, data, state);
@@ -728,7 +728,7 @@
* This function is the frotnend for reading SMS. Note that SMS field
* in the gn_data structure must be initialized.
*/
-API gn_error gn_sms_get(gn_data *data, struct gn_statemachine *state)
+GNOKII_API gn_error gn_sms_get(gn_data *data, struct gn_statemachine *state)
{
gn_error error;
gn_sms_raw rawsms;
@@ -752,7 +752,7 @@
* This function is the frontend for deleting SMS. Note that SMS field
* in the gn_data structure must be initialized.
*/
-API gn_error gn_sms_delete(gn_data *data, struct gn_statemachine *state)
+GNOKII_API gn_error gn_sms_delete(gn_data *data, struct gn_statemachine *state)
{
gn_sms_raw rawsms;
@@ -773,7 +773,7 @@
return gn_sm_functions(GN_OP_GetSMSnoValidate, data, state);
}
-API gn_error gn_sms_get_no_validate(gn_data *data, struct gn_statemachine
*state)
+GNOKII_API gn_error gn_sms_get_no_validate(gn_data *data, struct
gn_statemachine *state)
{
gn_error error;
gn_sms_raw rawsms;
@@ -789,7 +789,7 @@
return gn_sms_parse(data);
}
-API gn_error gn_sms_delete_no_validate(gn_data *data, struct gn_statemachine
*state)
+GNOKII_API gn_error gn_sms_delete_no_validate(gn_data *data, struct
gn_statemachine *state)
{
gn_sms_raw rawsms;
@@ -897,7 +897,7 @@
}
-API gn_error gn_sms_get_folder_changes(gn_data *data, struct gn_statemachine
*state, int has_folders)
+GNOKII_API gn_error gn_sms_get_folder_changes(gn_data *data, struct
gn_statemachine *state, int has_folders)
{
gn_error error;
gn_sms_folder sms_folder;
@@ -1277,7 +1277,7 @@
* and then phone driver takes the fields it needs and sends it in the
* phone specific way to the phone.
*/
-API gn_error gn_sms_send(gn_data *data, struct gn_statemachine *state)
+GNOKII_API gn_error gn_sms_send(gn_data *data, struct gn_statemachine *state)
{
gn_error error = GN_ERR_NONE;
@@ -1311,7 +1311,7 @@
return error;
}
-API int gn_sms_udh_add(gn_sms *sms, gn_sms_udh_type type)
+GNOKII_API int gn_sms_udh_add(gn_sms *sms, gn_sms_udh_type type)
{
sms->udh.length += headers[type].length;
sms->udh.udh[sms->udh.number].type = type;
@@ -1411,7 +1411,7 @@
return GN_ERR_NONE;
}
-API gn_error gn_sms_save(gn_data *data, struct gn_statemachine *state)
+GNOKII_API gn_error gn_sms_save(gn_data *data, struct gn_statemachine *state)
{
gn_error error = GN_ERR_NONE;
gn_sms_raw rawsms;
Index: gsm-statemachine.c
===================================================================
RCS file: /sources/gnokii/gnokii/common/gsm-statemachine.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- gsm-statemachine.c 30 Apr 2006 12:37:27 -0000 1.60
+++ gsm-statemachine.c 11 Jun 2006 16:39:48 -0000 1.61
@@ -1,6 +1,6 @@
/*
- $Id: gsm-statemachine.c,v 1.60 2006/04/30 12:37:27 pkot Exp $
+ $Id: gsm-statemachine.c,v 1.61 2006/06/11 16:39:48 deller Exp $
G N O K I I
@@ -62,7 +62,7 @@
else return GN_ERR_NOTREADY;
}
-API gn_state gn_sm_loop(int timeout, struct gn_statemachine *state)
+GNOKII_API gn_state gn_sm_loop(int timeout, struct gn_statemachine *state)
{
struct timeval loop_timeout;
int i;
@@ -338,7 +338,7 @@
}
/* Just to do things neatly */
-API gn_error gn_sm_functions(gn_operation op, gn_data *data, struct
gn_statemachine *sm)
+GNOKII_API gn_error gn_sm_functions(gn_operation op, gn_data *data, struct
gn_statemachine *sm)
{
if (!sm->driver.functions) {
dprintf("Sorry, phone has not yet been converted to new style.
Phone.Functions == NULL!\n");
Index: ldif.c
===================================================================
RCS file: /sources/gnokii/gnokii/common/ldif.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- ldif.c 13 Jan 2006 22:31:10 -0000 1.13
+++ ldif.c 11 Jun 2006 16:39:48 -0000 1.14
@@ -1,6 +1,6 @@
/*
- $Id: ldif.c,v 1.13 2006/01/13 22:31:10 pkot Exp $
+ $Id: ldif.c,v 1.14 2006/06/11 16:39:48 deller Exp $
G N O K I I
@@ -73,7 +73,7 @@
return 1;
}
-API int gn_phonebook2ldif(FILE *f, gn_phonebook_entry *entry)
+GNOKII_API int gn_phonebook2ldif(FILE *f, gn_phonebook_entry *entry)
{
char *aux;
int i;
@@ -163,7 +163,7 @@
#define ERROR(a) fprintf(stderr, "%s\n", a)
/* We assume gn_phonebook_entry is ready for writing in, ie. no rubbish inside
*/
-API int gn_ldif2phonebook(FILE *f, gn_phonebook_entry *entry)
+GNOKII_API int gn_ldif2phonebook(FILE *f, gn_phonebook_entry *entry)
{
char buf[10240];
int i;
Index: libfunctions.c
===================================================================
RCS file: /sources/gnokii/gnokii/common/libfunctions.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- libfunctions.c 11 Jun 2006 16:17:25 -0000 1.22
+++ libfunctions.c 11 Jun 2006 16:39:48 -0000 1.23
@@ -1,5 +1,5 @@
/*
- $Id: libfunctions.c,v 1.22 2006/06/11 16:17:25 deller Exp $
+ $Id: libfunctions.c,v 1.23 2006/06/11 16:39:48 deller Exp $
G N O K I I
@@ -50,13 +50,13 @@
/* this macro sets the "lasterror" code */
#define LASTERROR(state,nr) ((state->lasterror = nr)) /* do not delete the
double brackets! */
-API unsigned int gn_lib_version()
+GNOKII_API unsigned int gn_lib_version()
{
/* return the library version number at compile time of libgnokii */
return LIBGNOKII_VERSION;
}
-API gn_error gn_lib_phoneprofile_load( const char *configname, struct
gn_statemachine **state )
+GNOKII_API gn_error gn_lib_phoneprofile_load( const char *configname, struct
gn_statemachine **state )
{
gn_error error;
*state = NULL;
@@ -83,7 +83,7 @@
return LASTERROR((*state), GN_ERR_NONE);
}
-API gn_error gn_lib_phoneprofile_free( struct gn_statemachine **state )
+GNOKII_API gn_error gn_lib_phoneprofile_free( struct gn_statemachine **state )
{
/* free data structure */
free(*state);
@@ -92,7 +92,7 @@
return GN_ERR_NONE;
}
-API void gn_lib_library_free( void )
+GNOKII_API void gn_lib_library_free( void )
{
if (gn_cfg_info) {
gn_cfg_free_default();
@@ -100,7 +100,7 @@
}
/* return last error code */
-API gn_error gn_lib_lasterror( struct gn_statemachine *state )
+GNOKII_API gn_error gn_lib_lasterror( struct gn_statemachine *state )
{
if (state)
return state->lasterror;
@@ -109,7 +109,7 @@
}
-API gn_error gn_lib_phone_open( struct gn_statemachine *state )
+GNOKII_API gn_error gn_lib_phone_open( struct gn_statemachine *state )
{
const char *aux;
gn_error error;
@@ -135,7 +135,7 @@
return LASTERROR(state, GN_ERR_NONE);
}
-API gn_error gn_lib_phone_close( struct gn_statemachine *state )
+GNOKII_API gn_error gn_lib_phone_close( struct gn_statemachine *state )
{
/* close phone connection */
gn_sm_functions(GN_OP_Terminate, NULL, state);
@@ -181,7 +181,7 @@
}
/* ask phone for static information (model, version, manufacturer, revision
and imei) */
-API const char *gn_lib_get_phone_model( struct gn_statemachine *state )
+GNOKII_API const char *gn_lib_get_phone_model( struct gn_statemachine *state )
{
const char *aux;
@@ -193,31 +193,31 @@
return state->config.m_model;
}
-API const char *gn_lib_get_phone_product_name( struct gn_statemachine *state )
+GNOKII_API const char *gn_lib_get_phone_product_name( struct gn_statemachine
*state )
{
gn_lib_get_phone_information(state);
return state->config.m_model; /* e.g. NPE-4 */
}
-API const char *gn_lib_get_phone_manufacturer( struct gn_statemachine *state )
+GNOKII_API const char *gn_lib_get_phone_manufacturer( struct gn_statemachine
*state )
{
gn_lib_get_phone_information(state);
return state->config.m_manufacturer;
}
-API const char *gn_lib_get_phone_revision( struct gn_statemachine *state )
+GNOKII_API const char *gn_lib_get_phone_revision( struct gn_statemachine
*state )
{
gn_lib_get_phone_information(state);
return state->config.m_revision;
}
-API const char *gn_lib_get_phone_imei( struct gn_statemachine *state )
+GNOKII_API const char *gn_lib_get_phone_imei( struct gn_statemachine *state )
{
gn_lib_get_phone_information(state);
return state->config.m_imei;
}
-API const char *gn_lib_cfg_get(const char *section, const char *key)
+GNOKII_API const char *gn_lib_cfg_get(const char *section, const char *key)
{
if (!gn_cfg_info)
gn_cfg_read_default();
@@ -228,7 +228,7 @@
/* Phone addressbook functions */
-API gn_error gn_lib_addressbook_memstat( struct gn_statemachine *state,
+GNOKII_API gn_error gn_lib_addressbook_memstat( struct gn_statemachine *state,
const gn_memory_type memory_type, int *num_used, int *num_free )
{
gn_error error;
@@ -249,7 +249,7 @@
return LASTERROR(state, error);
}
-API gn_error gn_lib_phonebook_read_entry( struct gn_statemachine *state,
+GNOKII_API gn_error gn_lib_phonebook_read_entry( struct gn_statemachine *state,
const gn_memory_type memory_type, const int index )
{
gn_error error;
@@ -262,7 +262,7 @@
return LASTERROR(state, error);
}
-API int gn_lib_phonebook_entry_isempty( struct gn_statemachine *state,
+GNOKII_API int gn_lib_phonebook_entry_isempty( struct gn_statemachine *state,
const gn_memory_type memory_type, const int index )
{
gn_error error;
@@ -276,42 +276,42 @@
}
/* after reading an entry with gn_lib_phonebook_read_entry() ask for the
values of the phonebook entry */
-API const char *gn_lib_get_pb_name( struct gn_statemachine *state )
+GNOKII_API const char *gn_lib_get_pb_name( struct gn_statemachine *state )
{
return state->u.pb_entry.name;
}
-API const char *gn_lib_get_pb_number( struct gn_statemachine *state )
+GNOKII_API const char *gn_lib_get_pb_number( struct gn_statemachine *state )
{
return state->u.pb_entry.number;
}
-API gn_phonebook_group_type gn_lib_get_pb_caller_group( struct gn_statemachine
*state )
+GNOKII_API gn_phonebook_group_type gn_lib_get_pb_caller_group( struct
gn_statemachine *state )
{
return state->u.pb_entry.caller_group;
}
-API gn_memory_type gn_lib_get_pb_memtype( struct gn_statemachine *state )
+GNOKII_API gn_memory_type gn_lib_get_pb_memtype( struct gn_statemachine *state
)
{
return state->u.pb_entry.memory_type;
}
-API int gn_lib_get_pb_location( struct gn_statemachine *state )
+GNOKII_API int gn_lib_get_pb_location( struct gn_statemachine *state )
{
return state->u.pb_entry.location;
}
-API gn_timestamp gn_lib_get_pb_date( struct gn_statemachine *state )
+GNOKII_API gn_timestamp gn_lib_get_pb_date( struct gn_statemachine *state )
{
return state->u.pb_entry.date;
}
-API int gn_lib_get_pb_num_subentries( struct gn_statemachine *state )
+GNOKII_API int gn_lib_get_pb_num_subentries( struct gn_statemachine *state )
{
return state->u.pb_entry.subentries_count;
}
-API gn_error gn_lib_get_pb_subentry( struct gn_statemachine *state, const int
index,
+GNOKII_API gn_error gn_lib_get_pb_subentry( struct gn_statemachine *state,
const int index,
gn_phonebook_entry_type *entry_type, gn_phonebook_number_type
*number_type,
const char **number )
{
@@ -322,7 +322,7 @@
}
-API gn_error gn_lib_phonebook_entry_delete( struct gn_statemachine *state,
+GNOKII_API gn_error gn_lib_phonebook_entry_delete( struct gn_statemachine
*state,
const gn_memory_type memory_type, const int index )
{
gn_error error;
@@ -337,7 +337,7 @@
return LASTERROR(state, error);
}
-API gn_error gn_lib_phonebook_prepare_write_entry( struct gn_statemachine
*state )
+GNOKII_API gn_error gn_lib_phonebook_prepare_write_entry( struct
gn_statemachine *state )
{
gn_data *data = &state->sm_data;
gn_data_clear(data);
@@ -345,7 +345,7 @@
return LASTERROR(state, GN_ERR_NONE);
}
-API gn_error gn_lib_phonebook_write_entry( struct gn_statemachine *state,
+GNOKII_API gn_error gn_lib_phonebook_write_entry( struct gn_statemachine
*state,
const gn_memory_type memory_type, const int index )
{
gn_error error;
@@ -358,43 +358,43 @@
return LASTERROR(state, error);
}
-API gn_error gn_lib_set_pb_name( struct gn_statemachine *state, const char
*name )
+GNOKII_API gn_error gn_lib_set_pb_name( struct gn_statemachine *state, const
char *name )
{
strncpy(state->u.pb_entry.name, name, sizeof(state->u.pb_entry.name)-1);
return LASTERROR(state, GN_ERR_NONE);
}
-API gn_error gn_lib_set_pb_number( struct gn_statemachine *state, const char
*number )
+GNOKII_API gn_error gn_lib_set_pb_number( struct gn_statemachine *state, const
char *number )
{
strncpy(state->u.pb_entry.number, number,
sizeof(state->u.pb_entry.number)-1);
return LASTERROR(state, GN_ERR_NONE);
}
-API gn_error gn_lib_set_pb_caller_group( struct gn_statemachine *state,
gn_phonebook_group_type grouptype )
+GNOKII_API gn_error gn_lib_set_pb_caller_group( struct gn_statemachine *state,
gn_phonebook_group_type grouptype )
{
state->u.pb_entry.caller_group = grouptype;
return LASTERROR(state, GN_ERR_NONE);
}
-API gn_error gn_lib_set_pb_memtype( struct gn_statemachine *state,
gn_memory_type memtype )
+GNOKII_API gn_error gn_lib_set_pb_memtype( struct gn_statemachine *state,
gn_memory_type memtype )
{
state->u.pb_entry.memory_type = memtype;
return LASTERROR(state, GN_ERR_NONE);
}
-API gn_error gn_lib_set_pb_location( struct gn_statemachine *state, int
location )
+GNOKII_API gn_error gn_lib_set_pb_location( struct gn_statemachine *state, int
location )
{
state->u.pb_entry.location = location;
return LASTERROR(state, GN_ERR_NONE);
}
-API gn_error gn_lib_set_pb_date( struct gn_statemachine *state, gn_timestamp
timestamp )
+GNOKII_API gn_error gn_lib_set_pb_date( struct gn_statemachine *state,
gn_timestamp timestamp )
{
state->u.pb_entry.date = timestamp;
return LASTERROR(state, GN_ERR_NONE);
}
-API gn_error gn_lib_set_pb_subentry( struct gn_statemachine *state, const int
index, /* index=-1 appends it */
+GNOKII_API gn_error gn_lib_set_pb_subentry( struct gn_statemachine *state,
const int index, /* index=-1 appends it */
gn_phonebook_entry_type entry_type, gn_phonebook_number_type
number_type, const char *number )
{
int i = (index==-1) ? gn_lib_get_pb_num_subentries(state) : index;
@@ -413,7 +413,7 @@
/* helper functions */
-API void gn_timestamp_set(gn_timestamp *dt, int year, int month, int day,
+GNOKII_API void gn_timestamp_set(gn_timestamp *dt, int year, int month, int
day,
int hour, int minute, int second, int timezone)
{
dt->year = year;
@@ -425,7 +425,7 @@
dt->timezone = timezone;
}
-API void gn_timestamp_get(gn_timestamp *dt, int *year, int *month, int *day,
+GNOKII_API void gn_timestamp_get(gn_timestamp *dt, int *year, int *month, int
*day,
int *hour, int *minute, int *second, int *timezone)
{
if (year) *year = dt->year;
Index: misc.c
===================================================================
RCS file: /sources/gnokii/gnokii/common/misc.c,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -b -r1.110 -r1.111
--- misc.c 7 May 2006 20:08:47 -0000 1.110
+++ misc.c 11 Jun 2006 16:39:48 -0000 1.111
@@ -1,6 +1,6 @@
/*
- $Id: misc.c,v 1.110 2006/05/07 20:08:47 deller Exp $
+ $Id: misc.c,v 1.111 2006/06/11 16:39:48 deller Exp $
G N O K I I
@@ -55,12 +55,12 @@
#include "misc.h"
#include "gnokii.h"
-API gn_log_target gn_log_debug_mask = GN_LOG_T_NONE;
-API gn_log_target gn_log_rlpdebug_mask = GN_LOG_T_NONE;
-API gn_log_target gn_log_xdebug_mask = GN_LOG_T_NONE;
-API void (*gn_elog_handler)(const char *fmt, va_list ap) = NULL;
+GNOKII_API gn_log_target gn_log_debug_mask = GN_LOG_T_NONE;
+GNOKII_API gn_log_target gn_log_rlpdebug_mask = GN_LOG_T_NONE;
+GNOKII_API gn_log_target gn_log_xdebug_mask = GN_LOG_T_NONE;
+GNOKII_API void (*gn_elog_handler)(const char *fmt, va_list ap) = NULL;
-API int gn_line_get(FILE *file, char *line, int count)
+GNOKII_API int gn_line_get(FILE *file, char *line, int count)
{
char *ptr;
@@ -308,7 +308,7 @@
#define MODELS_NUM_ENTRIES (sizeof(models)/sizeof(models[0]))
/* this should be in libfunctions - will move it there with next version of
libgnokii */
-API const char *gn_lib_get_supported_phone_model( const int num )
+GNOKII_API const char *gn_lib_get_supported_phone_model( const int num )
{
if (num < 0 || num >= MODELS_NUM_ENTRIES)
return NULL;
@@ -316,7 +316,7 @@
}
-API gn_phone_model *gn_phone_model_get(const char *product_name)
+GNOKII_API gn_phone_model *gn_phone_model_get(const char *product_name)
{
int i = 0;
@@ -331,7 +331,7 @@
return (&models[MODELS_NUM_ENTRIES-1]); /* NULL entry */
}
-API const char *gn_model_get(const char *product_name)
+GNOKII_API const char *gn_model_get(const char *product_name)
{
return (gn_phone_model_get(product_name)->model);
}
@@ -344,7 +344,7 @@
}
}
-API void gn_log_debug(const char *fmt, ...)
+GNOKII_API void gn_log_debug(const char *fmt, ...)
{
#ifdef DEBUG
va_list ap;
@@ -357,7 +357,7 @@
#endif
}
-API void gn_log_rlpdebug(const char *fmt, ...)
+GNOKII_API void gn_log_rlpdebug(const char *fmt, ...)
{
#ifdef RLP_DEBUG
va_list ap;
@@ -370,7 +370,7 @@
#endif
}
-API void gn_log_xdebug(const char *fmt, ...)
+GNOKII_API void gn_log_xdebug(const char *fmt, ...)
{
#ifdef XDEBUG
va_list ap;
@@ -383,7 +383,7 @@
#endif
}
-API void gn_elog_write(const char *fmt, ...)
+GNOKII_API void gn_elog_write(const char *fmt, ...)
{
va_list ap;
@@ -411,7 +411,7 @@
#endif
/* Lock the device. Return allocated string with a lock name */
-API char *gn_device_lock(const char* port)
+GNOKII_API char *gn_device_lock(const char* port)
{
#ifndef WIN32
char *lock_file = NULL;
@@ -512,7 +512,7 @@
}
/* Removes lock and frees memory */
-API bool gn_device_unlock(char *lock_file)
+GNOKII_API bool gn_device_unlock(char *lock_file)
{
#ifndef WIN32
int err;
@@ -582,7 +582,7 @@
/*
* check if the timestamp in dt has valid date and time
*/
-API int gn_timestamp_isvalid(gn_timestamp dt)
+GNOKII_API int gn_timestamp_isvalid(gn_timestamp dt)
{
#define BETWEEN(a, x, y) ((a >= x) && (a <= y))
int daynum;
Index: vcal.c
===================================================================
RCS file: /sources/gnokii/gnokii/common/vcal.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- vcal.c 11 Apr 2006 21:31:42 -0000 1.11
+++ vcal.c 11 Jun 2006 16:39:48 -0000 1.12
@@ -1,6 +1,6 @@
/*
- $Id: vcal.c,v 1.11 2006/04/11 21:31:42 pkot Exp $
+ $Id: vcal.c,v 1.12 2006/06/11 16:39:48 deller Exp $
G N O K I I
@@ -71,7 +71,7 @@
/*
ICALENDAR Reading functions
*/
-API int gn_calnote2ical(FILE *f, gn_calnote *calnote)
+GNOKII_API int gn_calnote2ical(FILE *f, gn_calnote *calnote)
{
#ifdef HAVE_LIBICAL
# define MAX_PROP_INDEX 5
@@ -289,7 +289,7 @@
}
/* read a vcalendar event given by id from file f and store the data in
calnote */
-API int gn_ical2calnote(FILE *f, gn_calnote *calnote, int id)
+GNOKII_API int gn_ical2calnote(FILE *f, gn_calnote *calnote, int id)
{
int retval = GN_ERR_FAILED;
#ifdef HAVE_LIBICAL
@@ -428,7 +428,7 @@
return retval;
}
-API int gn_todo2ical(FILE *f, gn_todo *ctodo)
+GNOKII_API int gn_todo2ical(FILE *f, gn_todo *ctodo)
{
#ifdef HAVE_LIBICAL
icalcomponent *pIcal = NULL;
@@ -478,7 +478,7 @@
}
/* read the entry identified by id from the vcal file f and write it to the
phone */
-API int gn_ical2todo(FILE *f, gn_todo *ctodo, int id)
+GNOKII_API int gn_ical2todo(FILE *f, gn_todo *ctodo, int id)
{
#ifdef HAVE_LIBICAL
icalparser *parser = NULL;
Index: vcard.c
===================================================================
RCS file: /sources/gnokii/gnokii/common/vcard.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- vcard.c 1 May 2006 16:40:12 -0000 1.17
+++ vcard.c 11 Jun 2006 16:39:48 -0000 1.18
@@ -1,6 +1,6 @@
/*
- $Id: vcard.c,v 1.17 2006/05/01 16:40:12 pkot Exp $
+ $Id: vcard.c,v 1.18 2006/06/11 16:39:48 deller Exp $
G N O K I I
@@ -36,7 +36,7 @@
#include "gnokii.h"
#include "gnokii-internal.h"
-API int gn_phonebook2vcard(FILE * f, gn_phonebook_entry *entry, char *location)
+GNOKII_API int gn_phonebook2vcard(FILE * f, gn_phonebook_entry *entry, char
*location)
{
int i;
char name[2 * GN_PHONEBOOK_NAME_MAX_LENGTH];
@@ -138,7 +138,7 @@
#define ERROR(a) fprintf(stderr, "%s\n", a)
/* We assume gn_phonebook_entry is ready for writing in, ie. no rubbish inside
*/
-API int gn_vcard2phonebook(FILE *f, gn_phonebook_entry *entry)
+GNOKII_API int gn_vcard2phonebook(FILE *f, gn_phonebook_entry *entry)
{
char buf[1024];
char memloc[10];
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- gnokii/common cfgreader.c device.c gsm-api.c gs...,
Helge Deller <=