diff -ru --exclude=CVS gnokii-cvs/ChangeLog gnokii-devel/ChangeLog --- gnokii-cvs/ChangeLog 2005-03-28 23:00:56.000000000 +0200 +++ gnokii-devel/ChangeLog 2005-03-29 10:52:28.263196927 +0200 @@ -53,6 +53,7 @@ character at the end of each entry (Pawel Kot) o escape '\n', '\r', ';', ',' and '\' in the phonebook entries for raw and vcard types (ldif is todo) (Pawel Kot) + o lvalue casts eliminated (BORBELY Zoltan) * 6100 driver updates o add Nokia 8850 support (Denis Pitzalis) o handle new frames when SIM card is not inserted (Pawel Kot) diff -ru --exclude=CVS gnokii-cvs/common/cfgreader.c gnokii-devel/common/cfgreader.c --- gnokii-cvs/common/cfgreader.c 2005-03-28 23:00:57.000000000 +0200 +++ gnokii-devel/common/cfgreader.c 2005-03-29 10:21:06.585933137 +0200 @@ -459,7 +459,7 @@ retval = gn_cfg_read_default(); - (char *)*bindir = gn_cfg_get(gn_cfg_info, "global", "bindir"); + *bindir = gn_cfg_get(gn_cfg_info, "global", "bindir"); if (!*bindir) *bindir = gn_cfg_get(gn_cfg_info, "gnokiid", "bindir"); if (!*bindir) *bindir = "/usr/local/sbin"; diff -ru --exclude=CVS gnokii-cvs/common/links/fbus-3110.c gnokii-devel/common/links/fbus-3110.c --- gnokii-cvs/common/links/fbus-3110.c 2004-05-03 11:12:43.000000000 +0200 +++ gnokii-devel/common/links/fbus-3110.c 2005-03-29 10:24:18.527281906 +0200 @@ -58,7 +58,7 @@ /* FIXME - win32 stuff! */ -#define FBUSINST(s) ((fb3110_link *)((s)->link.link_instance)) +#define FBUSINST(s) (*((fb3110_link **)(&(s)->link.link_instance))) /*--------------------------------------------*/ diff -ru --exclude=CVS gnokii-cvs/common/links/fbus-phonet.c gnokii-devel/common/links/fbus-phonet.c --- gnokii-cvs/common/links/fbus-phonet.c 2005-01-03 09:18:59.000000000 +0100 +++ gnokii-devel/common/links/fbus-phonet.c 2005-03-29 10:24:34.008967627 +0200 @@ -52,7 +52,7 @@ static gn_error phonet_send_message(unsigned int messagesize, unsigned char messagetype, unsigned char *message, struct gn_statemachine *state); -#define FBUSINST(s) ((phonet_incoming_message *)((s)->link.link_instance)) +#define FBUSINST(s) (*((phonet_incoming_message **)(&(s)->link.link_instance))) #define FBUS_PHONET_BLUETOOTH_INITSEQ 0xd0, 0x00, 0x01 diff -ru --exclude=CVS gnokii-cvs/common/links/fbus.c gnokii-devel/common/links/fbus.c --- gnokii-cvs/common/links/fbus.c 2004-07-20 21:11:00.000000000 +0200 +++ gnokii-devel/common/links/fbus.c 2005-03-29 10:25:15.589749668 +0200 @@ -54,7 +54,7 @@ /* FIXME - win32 stuff! */ -#define FBUSINST(s) ((fbus_link *)((s)->link.link_instance)) +#define FBUSINST(s) (*((fbus_link **)(&(s)->link.link_instance))) #define IR_MODE(s) ((s)->config.connection_type == GN_CT_Infrared || (s)->config.connection_type == GN_CT_Tekram) diff -ru --exclude=CVS gnokii-cvs/common/phones/gnapplet.c gnokii-devel/common/phones/gnapplet.c --- gnokii-cvs/common/phones/gnapplet.c 2005-03-28 23:00:58.000000000 +0200 +++ gnokii-devel/common/phones/gnapplet.c 2005-03-29 10:27:00.291078881 +0200 @@ -48,7 +48,7 @@ #include "gnokii-internal.h" #include "gnokii.h" -#define DRVINSTANCE(s) ((gnapplet_driver_instance *)((s)->driver.driver_instance)) +#define DRVINSTANCE(s) (*((gnapplet_driver_instance **)(&(s)->driver.driver_instance))) #define FREE(p) do { free(p); (p) = NULL; } while (0) #define REQUEST_DEFN(n) \ diff -ru --exclude=CVS gnokii-cvs/common/phones/nk3110.c gnokii-devel/common/phones/nk3110.c --- gnokii-cvs/common/phones/nk3110.c 2003-06-14 17:00:56.000000000 +0200 +++ gnokii-devel/common/phones/nk3110.c 2005-03-29 10:27:37.371524530 +0200 @@ -49,7 +49,7 @@ #include "gnokii-internal.h" -#define DRVINSTANCE(s) ((nk3110_driver_instance *)((s)->driver.driver_instance)) +#define DRVINSTANCE(s) (*((nk3110_driver_instance **)(&(s)->driver.driver_instance))) #define FREE(p) do { free(p); (p) = NULL; } while (0) /* Prototypes */ diff -ru --exclude=CVS gnokii-cvs/common/phones/nk6100.c gnokii-devel/common/phones/nk6100.c --- gnokii-cvs/common/phones/nk6100.c 2005-03-28 23:00:59.000000000 +0200 +++ gnokii-devel/common/phones/nk6100.c 2005-03-29 10:17:01.406652639 +0200 @@ -52,7 +52,7 @@ #include "gnokii-internal.h" #include "gnokii.h" -#define DRVINSTANCE(s) ((nk6100_driver_instance *)((s)->driver.driver_instance)) +#define DRVINSTANCE(s) (*((nk6100_driver_instance **)(&(s)->driver.driver_instance))) #define FREE(p) do { free(p); (p) = NULL; } while (0) /* static functions prototypes */ diff -ru --exclude=CVS gnokii-cvs/common/phones/nk6160.c gnokii-devel/common/phones/nk6160.c --- gnokii-cvs/common/phones/nk6160.c 2003-10-28 01:03:40.000000000 +0100 +++ gnokii-devel/common/phones/nk6160.c 2005-03-29 10:28:30.585549666 +0200 @@ -58,7 +58,7 @@ int logoslice; } nk6160_driver_instance; -#define NK6160_DRVINST(s) ((nk6160_driver_instance *)((s)->driver.driver_instance)) +#define NK6160_DRVINST(s) (*((nk6160_driver_instance **)(&(s)->driver.driver_instance))) /* static functions prototypes */ static gn_error functions(gn_operation op, gn_data *data, struct gn_statemachine *state); diff -ru --exclude=CVS gnokii-cvs/common/phones/nk7110.c gnokii-devel/common/phones/nk7110.c --- gnokii-cvs/common/phones/nk7110.c 2005-01-25 00:18:15.000000000 +0100 +++ gnokii-devel/common/phones/nk7110.c 2005-03-29 10:05:07.008820022 +0200 @@ -50,7 +50,7 @@ #include "gnokii-internal.h" -#define DRVINSTANCE(s) ((nk7110_driver_instance *)((s)->driver.driver_instance)) +#define DRVINSTANCE(s) (*((nk7110_driver_instance **)(&(s)->driver.driver_instance))) #define FREE(p) do { free(p); (p) = NULL; } while (0) #define SEND_MESSAGE_BLOCK(type, length) \ diff -ru --exclude=CVS gnokii-cvs/include/links/atbus.h gnokii-devel/include/links/atbus.h --- gnokii-cvs/include/links/atbus.h 2003-03-06 22:38:42.000000000 +0100 +++ gnokii-devel/include/links/atbus.h 2005-03-29 10:30:00.790021532 +0200 @@ -55,6 +55,6 @@ int binlen; } atbus_instance; -#define AT_BUSINST(s) ((atbus_instance *)((s)->link.link_instance)) +#define AT_BUSINST(s) (*((atbus_instance **)(&(s)->link.link_instance))) #endif /* #ifndef _gnokii_atbus_h */ diff -ru --exclude=CVS gnokii-cvs/include/links/cbus.h gnokii-devel/include/links/cbus.h --- gnokii-cvs/include/links/cbus.h 2003-02-27 09:18:26.000000000 +0100 +++ gnokii-devel/include/links/cbus.h 2005-03-29 10:30:16.742627879 +0200 @@ -57,7 +57,7 @@ unsigned char prev_rx_byte; } cbus_instance; -#define CBUSINST(s) ((cbus_instance *)((s)->link.link_instance)) +#define CBUSINST(s) (*((cbus_instance **)(&(s)->link.link_instance))) gn_error cbus_initialise(struct gn_statemachine *state); diff -ru --exclude=CVS gnokii-cvs/include/links/gnbus.h gnokii-devel/include/links/gnbus.h --- gnokii-cvs/include/links/gnbus.h 2004-03-26 11:12:43.000000000 +0100 +++ gnokii-devel/include/links/gnbus.h 2005-03-29 10:30:33.595098824 +0200 @@ -77,7 +77,7 @@ gnbus_incoming_message i; } gnbus_link; -#define GNBUSINST(s) ((gnbus_link *)((s)->link.link_instance)) +#define GNBUSINST(s) (*((gnbus_link **)(&(s)->link.link_instance))) gn_error gnbus_initialise(struct gn_statemachine *state); diff -ru --exclude=CVS gnokii-cvs/include/links/m2bus.h gnokii-devel/include/links/m2bus.h --- gnokii-cvs/include/links/m2bus.h 2003-03-06 22:38:46.000000000 +0100 +++ gnokii-devel/include/links/m2bus.h 2005-03-29 10:30:46.570151393 +0200 @@ -90,7 +90,7 @@ u8 request_sequence_number; } m2bus_link; -#define M2BUSINST(s) ((m2bus_link *)((s)->link.link_instance)) +#define M2BUSINST(s) (*((m2bus_link **)(&(s)->link.link_instance))) gn_error m2bus_initialise(struct gn_statemachine *state); diff -ru --exclude=CVS gnokii-cvs/include/phones/atgen.h gnokii-devel/include/phones/atgen.h --- gnokii-cvs/include/phones/atgen.h 2004-09-21 00:08:57.000000000 +0200 +++ gnokii-devel/include/phones/atgen.h 2005-03-29 10:29:48.076928848 +0200 @@ -76,7 +76,7 @@ at_charset charset; } at_driver_instance; -#define AT_DRVINST(s) ((at_driver_instance *)((s)->driver.driver_instance)) +#define AT_DRVINST(s) (*((at_driver_instance **)(&(s)->driver.driver_instance))) typedef struct { char *line1;