diff options
author | Joseph Herlant <aerostitch@users.noreply.github.com> | 2018-04-26 10:12:26 -0700 |
---|---|---|
committer | jkoan <jkoan@users.noreply.github.com> | 2018-04-26 19:12:26 +0200 |
commit | 221f783ea1caaaab2f5ceadc6b0fb3e720aac3df (patch) | |
tree | 1ecf89faa1dfa550477669b05ef5c36e9864f68a /navit/vehicle/webos | |
parent | 011bb15468b4cb626e9facecba924b04bd494d7f (diff) | |
download | navit-221f783ea1caaaab2f5ceadc6b0fb3e720aac3df.tar.gz |
Fix:debug:Change line separators for dbg to work also on win* platform (#546)
* Fix:debug:Change line separators for dbg to work also on win* platform
* Fix:debug:Break multiline dbg statements to use the new model
* Fix:debug:Move the EOL into debug_vprintf
Diffstat (limited to 'navit/vehicle/webos')
-rw-r--r-- | navit/vehicle/webos/bluetooth.c | 92 | ||||
-rw-r--r-- | navit/vehicle/webos/vehicle_webos.c | 32 |
2 files changed, 62 insertions, 62 deletions
diff --git a/navit/vehicle/webos/bluetooth.c b/navit/vehicle/webos/bluetooth.c index 343d2ec5c..31e3a575e 100644 --- a/navit/vehicle/webos/bluetooth.c +++ b/navit/vehicle/webos/bluetooth.c @@ -25,10 +25,10 @@ static void mlPDL_ServiceCall_callback(struct callback_list *cbl, char *service, char *parameters/*, struct callback *fail_cb*/) { PDL_Err err; - dbg(lvl_debug,"PDL_ServiceCall(%s) parameters(%s)\n",service,parameters); + dbg(lvl_debug,"PDL_ServiceCall(%s) parameters(%s)",service,parameters); err = PDL_ServiceCall(service, parameters); if (err != PDL_NOERROR) { - dbg(lvl_error,"PDL_ServiceCall to (%s) with (%s) failed with (%d): (%s)\n", service, parameters, err, PDL_GetError()); + dbg(lvl_error,"PDL_ServiceCall to (%s) with (%s) failed with (%d): (%s)", service, parameters, err, PDL_GetError()); } callback_list_destroy(cbl); @@ -50,7 +50,7 @@ mlPDL_ServiceCall(const char *service, const char *parameters/*, struct callback callback_list_add(cbl, cb); -dbg(lvl_debug,"event_call_callback(%p)\n",cbl); +dbg(lvl_debug,"event_call_callback(%p)",cbl); event_call_callback(cbl); } @@ -65,10 +65,10 @@ mlPDL_ServiceCallWithCallback_callback(struct callback_list *cbl, PDL_bool removeAfterResponse) { PDL_Err err; - dbg(lvl_debug,"PDL_ServiceCallWithCallback(%s) parameters(%s)\n",service,parameters); + dbg(lvl_debug,"PDL_ServiceCallWithCallback(%s) parameters(%s)",service,parameters); err = PDL_ServiceCallWithCallback(service, parameters, callback, user, removeAfterResponse); if (err != PDL_NOERROR) { - dbg(lvl_error,"PDL_ServiceCallWithCallback to (%s) with (%s) failed with (%d): (%s)\n", service, parameters, err, PDL_GetError()); + dbg(lvl_error,"PDL_ServiceCallWithCallback to (%s) with (%s) failed with (%d): (%s)", service, parameters, err, PDL_GetError()); } callback_list_destroy(cbl); @@ -94,7 +94,7 @@ mlPDL_ServiceCallWithCallback(const char *service, callback_list_add(cbl, cb); - dbg(lvl_debug,"event_call_callback(%p)\n",cbl); + dbg(lvl_debug,"event_call_callback(%p)",cbl); event_call_callback(cbl); } @@ -107,11 +107,11 @@ vehicle_webos_init_pdl_locationtracking_callback(struct vehicle_priv *priv, stru priv->gps_type = param ? GPS_TYPE_INT: GPS_TYPE_NONE; - dbg(lvl_debug,"Calling PDL_EnableLocationTracking(%i)\n",param); + dbg(lvl_debug,"Calling PDL_EnableLocationTracking(%i)",param); err = PDL_EnableLocationTracking(param); if (err != PDL_NOERROR) { - dbg(lvl_error,"PDL_EnableLocationTracking failed with (%d): (%s)\n", err, PDL_GetError()); + dbg(lvl_error,"PDL_EnableLocationTracking failed with (%d): (%s)", err, PDL_GetError()); // vehicle_webos_close(priv); // return 0; } @@ -146,10 +146,10 @@ vehicle_webos_parse_nmea(struct vehicle_priv *priv, char *buffer) int valid=0; int ret = 0; - dbg(lvl_info, "enter: buffer='%s'\n", buffer); + dbg(lvl_info, "enter: buffer='%s'", buffer); for (;;) { if (len < 4) { - dbg(lvl_error, "'%s' too short\n", buffer); + dbg(lvl_error, "'%s' too short", buffer); return ret; } if (buffer[len - 1] == '\r' || buffer[len - 1] == '\n') { @@ -160,22 +160,22 @@ vehicle_webos_parse_nmea(struct vehicle_priv *priv, char *buffer) break; } if (buffer[0] != '$') { - dbg(lvl_error, "no leading $ in '%s'\n", buffer); + dbg(lvl_error, "no leading $ in '%s'", buffer); return ret; } if (buffer[len - 3] != '*') { - dbg(lvl_error, "no *XX in '%s'\n", buffer); + dbg(lvl_error, "no *XX in '%s'", buffer); return ret; } for (i = 1; i < len - 3; i++) { csum ^= (unsigned char) (buffer[i]); } if (!sscanf(buffer + len - 2, "%x", &bcsum) /*&& priv->checksum_ignore != 2*/) { - dbg(lvl_error, "no checksum in '%s'\n", buffer); + dbg(lvl_error, "no checksum in '%s'", buffer); return ret; } if (bcsum != csum /*&& priv->checksum_ignore == 0*/) { - dbg(lvl_error, "wrong checksum in '%s was %x should be %x'\n", buffer,bcsum,csum); + dbg(lvl_error, "wrong checksum in '%s was %x should be %x'", buffer,bcsum,csum); return ret; } @@ -184,7 +184,7 @@ vehicle_webos_parse_nmea(struct vehicle_priv *priv, char *buffer) g_free(priv->nmea_data_buf); priv->nmea_data_buf=nmea_data_buf; } else { - dbg(lvl_error, "nmea buffer overflow, discarding '%s'\n", buffer); + dbg(lvl_error, "nmea buffer overflow, discarding '%s'", buffer); } i = 0; p = buffer; @@ -203,7 +203,7 @@ vehicle_webos_parse_nmea(struct vehicle_priv *priv, char *buffer) priv->delta = 0; // (unsigned int)difftime(tv.tv_sec, priv->fix_time); // priv->fix_time = tv.tv_sec; -// dbg(lvl_info,"delta(%i)\n",priv->delta); +// dbg(lvl_info,"delta(%i)",priv->delta); // } if (!strncmp(&buffer[3], "GGA", 3)) { @@ -230,7 +230,7 @@ vehicle_webos_parse_nmea(struct vehicle_priv *priv, char *buffer) if (!g_strcasecmp(item[5],"W")) priv->geo.lng=-priv->geo.lng; priv->valid=attr_position_valid_valid; - dbg(lvl_info, "latitude '%2.4f' longitude %2.4f\n", priv->geo.lat, priv->geo.lng); + dbg(lvl_info, "latitude '%2.4f' longitude %2.4f", priv->geo.lat, priv->geo.lng); } else priv->valid=attr_position_valid_invalid; @@ -275,7 +275,7 @@ vehicle_webos_parse_nmea(struct vehicle_priv *priv, char *buffer) if (valid) { priv->track = g_ascii_strtod( item[1], NULL ); priv->speed = g_ascii_strtod( item[7], NULL ); - dbg(lvl_info,"direction %lf, speed %2.1lf\n", priv->track, priv->speed); + dbg(lvl_info,"direction %lf, speed %2.1lf", priv->track, priv->speed); } } if (!strncmp(&buffer[3], "RMC", 3)) { @@ -380,7 +380,7 @@ vehicle_webos_parse_nmea(struct vehicle_priv *priv, char *buffer) */ if (item[1]) { priv->magnetic_direction = g_ascii_strtod( item[1], NULL ); - dbg(lvl_debug,"magnetic %d\n", priv->magnetic_direction); + dbg(lvl_debug,"magnetic %d", priv->magnetic_direction); } } return ret; @@ -396,14 +396,14 @@ vehicle_webos_spp_handle_read(PDL_ServiceParameters *params, void *user) //PDL_Err err; size = PDL_GetParamInt(params, "dataLength"); if (size > buffer_size) { - dbg(lvl_error, "read returned too much data\n"); + dbg(lvl_error, "read returned too much data"); return; } char buffer[buffer_size]; PDL_GetParamString(params,"data",buffer,buffer_size); - dbg(lvl_debug,"data(%s) dataLength(%i)\n",buffer,size); + dbg(lvl_debug,"data(%s) dataLength(%i)",buffer,size); memmove(priv->buffer + priv->buffer_pos, buffer, size); @@ -411,12 +411,12 @@ vehicle_webos_spp_handle_read(PDL_ServiceParameters *params, void *user) priv->buffer_pos += size; priv->buffer[priv->buffer_pos] = '\0'; - dbg(lvl_debug, "size=%d pos=%d buffer='%s'\n", size, + dbg(lvl_debug, "size=%d pos=%d buffer='%s'", size, priv->buffer_pos, priv->buffer); str = priv->buffer; while ((tok = strchr(str, '\n'))) { *tok++ = '\0'; - dbg(lvl_debug, "line='%s'\n", str); + dbg(lvl_debug, "line='%s'", str); rc += vehicle_webos_parse_nmea(priv, str); str = tok; // if (priv->file_type == file_type_file && rc) @@ -427,10 +427,10 @@ vehicle_webos_spp_handle_read(PDL_ServiceParameters *params, void *user) size = priv->buffer + priv->buffer_pos - str; memmove(priv->buffer, str, size + 1); priv->buffer_pos = size; - dbg(lvl_debug,"now pos=%d buffer='%s'\n", + dbg(lvl_debug,"now pos=%d buffer='%s'", priv->buffer_pos, priv->buffer); } else if (priv->buffer_pos == buffer_size - 1) { - dbg(lvl_error,"Overflow. Most likely wrong baud rate or no nmea protocol\n"); + dbg(lvl_error,"Overflow. Most likely wrong baud rate or no nmea protocol"); priv->buffer_pos = 0; } if (rc) { @@ -466,7 +466,7 @@ vehicle_webos_spp_init_read(struct vehicle_priv *priv, unsigned int length) ); #if 0 if (err != PDL_NOERROR) { - dbg(lvl_error,"PDL_ServiceCall failed with (%d): (%s)\n", err, PDL_GetError()); + dbg(lvl_error,"PDL_ServiceCall failed with (%d): (%s)", err, PDL_GetError()); vehicle_webos_close(priv); return; } @@ -481,7 +481,7 @@ vehicle_webos_spp_handle_open(PDL_ServiceParameters *params, void *user) if (!priv->buffer) priv->buffer = g_malloc(buffer_size); - dbg(lvl_debug,"instanceId(%i)\n",priv->spp_instance_id); + dbg(lvl_debug,"instanceId(%i)",priv->spp_instance_id); priv->gps_type = GPS_TYPE_BT; @@ -497,27 +497,27 @@ vehicle_webos_spp_notify(PDL_ServiceParameters *params, void *user) char parameters[128]; const char *params_json = PDL_GetParamJson(params); - dbg(lvl_info,"params_json(%s)\n", params_json); + dbg(lvl_info,"params_json(%s)", params_json); if (PDL_ParamExists(params, "errorText")) { PDL_GetParamString(params, "errorText", notification, sizeof(notification)); - dbg(lvl_error,"errorText(%s)\n",notification); + dbg(lvl_error,"errorText(%s)",notification); return; } PDL_GetParamString(params, "notification", notification, sizeof(notification)); notification[sizeof(notification)-1] = '\0'; - dbg(lvl_warning,"notification(%s) %i\n",notification,PDL_ParamExists(params, "notification")); + dbg(lvl_warning,"notification(%s) %i",notification,PDL_ParamExists(params, "notification")); if(strcmp(notification,"notifnservicenames") == 0) { int instance_id = PDL_GetParamInt(params, "instanceId"); - dbg(lvl_debug,"instanceId(%i)\n", instance_id); + dbg(lvl_debug,"instanceId(%i)", instance_id); cJSON *root = cJSON_Parse(params_json); if (!root) { - dbg(lvl_error,"parsing json failed\n"); + dbg(lvl_error,"parsing json failed"); return; } @@ -544,7 +544,7 @@ vehicle_webos_spp_notify(PDL_ServiceParameters *params, void *user) PDL_TRUE); } else { - dbg(lvl_error,"notifnconnected error(%i)\n",PDL_GetParamInt(params,"error")); + dbg(lvl_error,"notifnconnected error(%i)",PDL_GetParamInt(params,"error")); } } else if(strcmp(notification,"notifndisconnected") == 0) { @@ -563,7 +563,7 @@ vehicle_webos_init_bt_gps(struct vehicle_priv *priv, char *addr) { char parameters[128]; - dbg(lvl_debug,"subscribeNotifications\n"); + dbg(lvl_debug,"subscribeNotifications"); mlPDL_ServiceCallWithCallback("palm://com.palm.bluetooth/spp/subscribenotifications", "{\"subscribe\":true}", (PDL_ServiceCallbackFunc)vehicle_webos_spp_notify, @@ -571,7 +571,7 @@ vehicle_webos_init_bt_gps(struct vehicle_priv *priv, char *addr) PDL_FALSE); #if 0 if (err != PDL_NOERROR) { - dbg(lvl_error,"PDL_ServiceCallWithCallback failed with (%d): (%s)\n", err, PDL_GetError()); + dbg(lvl_error,"PDL_ServiceCallWithCallback failed with (%d): (%s)", err, PDL_GetError()); vehicle_webos_close(priv); return; } @@ -581,7 +581,7 @@ vehicle_webos_init_bt_gps(struct vehicle_priv *priv, char *addr) mlPDL_ServiceCall("palm://com.palm.bluetooth/spp/connect", parameters); #if 0 if (err != PDL_NOERROR) { - dbg(lvl_error,"PDL_ServiceCall failed with (%d): (%s)\n", err, PDL_GetError()); + dbg(lvl_error,"PDL_ServiceCall failed with (%d): (%s)", err, PDL_GetError()); vehicle_webos_close(priv); return; } @@ -598,38 +598,38 @@ vehicle_webos_bt_gap_callback(PDL_ServiceParameters *params, void *param) char *device_addr = NULL; cJSON *root; - dbg(lvl_debug,"enter\n"); + dbg(lvl_debug,"enter"); PDL_Err err; err = PDL_GetParamInt(params, "errorCode"); if (err != PDL_NOERROR) { - dbg(lvl_error,"BT GAP Callback errorCode %d\n", err); + dbg(lvl_error,"BT GAP Callback errorCode %d", err); return /*PDL_EOTHER*/; } params_json = PDL_GetParamJson(params); - dbg(lvl_info,"params_json(%s)\n",params_json); + dbg(lvl_info,"params_json(%s)",params_json); root = cJSON_Parse(params_json); if (!root) { - dbg(lvl_error,"parsing json failed\n"); + dbg(lvl_error,"parsing json failed"); return; } cJSON *trusted_devices = cJSON_GetObjectItem(root, "trusteddevices"); unsigned int i,c = cJSON_GetArraySize(trusted_devices); - dbg(lvl_debug, "trusted_devices(%i)\n",c); + dbg(lvl_debug, "trusted_devices(%i)",c); for(i=0; i < c && !device_addr; i++) { cJSON *device = cJSON_GetArrayItem(trusted_devices,i); char *name = cJSON_GetObjectItem(device, "name")->valuestring; char *address = cJSON_GetObjectItem(device, "address")->valuestring; char *status = cJSON_GetObjectItem(device, "status")->valuestring; - dbg(lvl_debug,"i(%i) name(%s) address(%s) status(%s)\n",i,name,address,status); + dbg(lvl_debug,"i(%i) name(%s) address(%s) status(%s)",i,name,address,status); if (/*strncmp(status, "connected",9) == 0 && */strstr(name, "GPS") != NULL) { - dbg(lvl_debug,"choose name(%s) address(%s)\n",name,address); + dbg(lvl_debug,"choose name(%s) address(%s)",name,address); device_addr = g_strdup(address); break; } @@ -649,7 +649,7 @@ vehicle_webos_bt_open(struct vehicle_priv *priv) { // Try to connect to BT GPS, or use PDL method - dbg(lvl_debug,"enter\n"); + dbg(lvl_debug,"enter"); PDL_Err err; err = PDL_ServiceCallWithCallback("palm://com.palm.bluetooth/gap/gettrusteddevices", @@ -658,7 +658,7 @@ vehicle_webos_bt_open(struct vehicle_priv *priv) priv, PDL_TRUE); if (err != PDL_NOERROR) { - dbg(lvl_error,"PDL_ServiceCallWithCallback failed with (%d): (%s)\n", err, PDL_GetError()); + dbg(lvl_error,"PDL_ServiceCallWithCallback failed with (%d): (%s)", err, PDL_GetError()); vehicle_webos_close(priv); return 0; } @@ -668,7 +668,7 @@ vehicle_webos_bt_open(struct vehicle_priv *priv) void vehicle_webos_bt_close(struct vehicle_priv *priv) { - dbg(lvl_debug,"XXX\n"); + dbg(lvl_debug,"XXX"); char parameters[128]; if (priv->spp_instance_id) { snprintf(parameters, sizeof(parameters), "{\"instanceId\":%i}", priv->spp_instance_id); diff --git a/navit/vehicle/webos/vehicle_webos.c b/navit/vehicle/webos/vehicle_webos.c index c4bdcbaf2..8ba477305 100644 --- a/navit/vehicle/webos/vehicle_webos.c +++ b/navit/vehicle/webos/vehicle_webos.c @@ -59,7 +59,7 @@ vehicle_webos_callback(PDL_ServiceParameters *params, void *priv) err = PDL_GetParamInt(params, "errorCode"); if (err != 0) { - dbg(lvl_error,"Location Callback errorCode %d\n", err); + dbg(lvl_error,"Location Callback errorCode %d", err); return /*PDL_EOTHER*/; } @@ -93,14 +93,14 @@ vehicle_webos_gps_update(struct vehicle_priv *priv, PDL_Location *location) gettimeofday(&tv,NULL); priv->delta = (int)difftime(tv.tv_sec, priv->fix_time); - dbg(lvl_info,"delta(%i)\n",priv->delta); + dbg(lvl_info,"delta(%i)",priv->delta); priv->fix_time = tv.tv_sec; priv->geo.lat = location->latitude; /* workaround for webOS GPS bug following */ priv->geo.lng = (priv->pdk_version >= 200 && location->longitude >= -1 && location->longitude <= 1) ? -location->longitude : location->longitude; - dbg(lvl_info,"Location: %f %f %f %.12g %.12g +-%fm\n", + dbg(lvl_info,"Location: %f %f %f %.12g %.12g +-%fm", location->altitude, location->velocity, location->heading, @@ -134,7 +134,7 @@ vehicle_webos_timeout_callback(struct vehicle_priv *priv) int delta = (int)difftime(tv.tv_sec, priv->fix_time); if (delta >= priv->delta*2) { - dbg(lvl_warning, "GPS timeout triggered cb(%p) delta(%d)\n", priv->timeout_cb, delta); + dbg(lvl_warning, "GPS timeout triggered cb(%p) delta(%d)", priv->timeout_cb, delta); priv->delta = -1; @@ -165,7 +165,7 @@ vehicle_webos_open(struct vehicle_priv *priv) PDL_Err err; priv->pdk_version = PDL_GetPDKVersion(); - dbg(lvl_debug,"pdk_version(%d)\n", priv->pdk_version); + dbg(lvl_debug,"pdk_version(%d)", priv->pdk_version); if (priv->pdk_version <= 100) { // Use Location Service via callback interface @@ -175,7 +175,7 @@ vehicle_webos_open(struct vehicle_priv *priv) priv, PDL_FALSE); if (err != PDL_NOERROR) { - dbg(lvl_error,"PDL_ServiceCallWithCallback failed with (%d): (%s)\n", err, PDL_GetError()); + dbg(lvl_error,"PDL_ServiceCallWithCallback failed with (%d): (%s)", err, PDL_GetError()); vehicle_webos_close(priv); return 0; } @@ -184,7 +184,7 @@ vehicle_webos_open(struct vehicle_priv *priv) PDL_Err err; err = PDL_EnableLocationTracking(PDL_TRUE); if (err != PDL_NOERROR) { - dbg(lvl_error,"PDL_EnableLocationTracking failed with (%d): (%s)\n", err, PDL_GetError()); + dbg(lvl_error,"PDL_EnableLocationTracking failed with (%d): (%s)", err, PDL_GetError()); // vehicle_webos_close(priv); // return 0; } @@ -214,15 +214,15 @@ vehicle_webos_position_attr_get(struct vehicle_priv *priv, { switch (type) { case attr_position_height: - dbg(lvl_info,"Altitude: %f\n", priv->altitude); + dbg(lvl_info,"Altitude: %f", priv->altitude); attr->u.numd = &priv->altitude; break; case attr_position_speed: - dbg(lvl_info,"Speed: %f\n", priv->speed); + dbg(lvl_info,"Speed: %f", priv->speed); attr->u.numd = &priv->speed; break; case attr_position_direction: - dbg(lvl_info,"Direction: %f\n", priv->track); + dbg(lvl_info,"Direction: %f", priv->track); attr->u.numd = &priv->track; break; case attr_position_magnetic_direction: @@ -246,11 +246,11 @@ vehicle_webos_position_attr_get(struct vehicle_priv *priv, } break; case attr_position_coord_geo: - dbg(lvl_info,"Coord: %.12g %.12g\n", priv->geo.lat, priv->geo.lng); + dbg(lvl_info,"Coord: %.12g %.12g", priv->geo.lat, priv->geo.lng); attr->u.coord_geo = &priv->geo; break; case attr_position_radius: - dbg(lvl_info,"Radius: %f\n", priv->radius); + dbg(lvl_info,"Radius: %f", priv->radius); attr->u.numd = &priv->radius; break; case attr_position_time_iso8601: @@ -265,10 +265,10 @@ vehicle_webos_position_attr_get(struct vehicle_priv *priv, priv->fix_time = 0; return 0; } - dbg(lvl_info,"Fix Time: %d %s\n", priv->fix_time, priv->fixiso8601); + dbg(lvl_info,"Fix Time: %d %s", priv->fix_time, priv->fixiso8601); } else { - dbg(lvl_info,"Fix Time: %d\n", priv->fix_time); + dbg(lvl_info,"Fix Time: %d", priv->fix_time); return 0; } @@ -326,7 +326,7 @@ vehicle_webos_set_attr_do(struct vehicle_priv *priv, struct attr *attr, int init switch (attr->type) { case attr_source: if (strncmp(vehicle_webos_prefix,attr->u.str,strlen(vehicle_webos_prefix))) { - dbg(lvl_warning,"source must start with '%s'\n", vehicle_webos_prefix); + dbg(lvl_warning,"source must start with '%s'", vehicle_webos_prefix); return 0; } g_free(priv->source); @@ -388,7 +388,7 @@ vehicle_webos_new(struct vehicle_methods void plugin_init(void) { - dbg(lvl_debug, "enter\n"); + dbg(lvl_debug, "enter"); plugin_register_category_vehicle("webos", vehicle_webos_new); } |