==== bluez-4.22/test/Makefile.am#1
5c5
< bin_PROGRAMS = l2test rctest
---
> bin_PROGRAMS = l2test rctest sdptest
7c7
< noinst_PROGRAMS = sdptest scotest attest hstest bdaddr lmptest agent passkey-agent
---
> noinst_PROGRAMS = scotest attest hstest bdaddr lmptest agent passkey-agent
==== bluez-4.22/test/Makefile.in#1
36,37c36,37
< @TEST_TRUE@bin_PROGRAMS = l2test$(EXEEXT) rctest$(EXEEXT)
< @TEST_TRUE@noinst_PROGRAMS = sdptest$(EXEEXT) scotest$(EXEEXT) \
---
> @TEST_TRUE@bin_PROGRAMS = l2test$(EXEEXT) rctest$(EXEEXT) sdptest$(EXEEXT)
> @TEST_TRUE@noinst_PROGRAMS = scotest$(EXEEXT) \
==== bluez-4.22/test/passkey-agent.c#1
39a40,47
> #if( __DEBUG__ )
>     #define LOG(...)        printf(__VA_ARGS__)
>     #define ERROR(...)      fprintf(__VA_ARGS__)
> #else
>     #define LOG(...)
>     #define ERROR(...)
> #endif
> 
61c69
<         fprintf( stderr, "Invalid arguments for NameOwnerChanged signal" );
---
>         ERROR( stderr, "Invalid arguments for NameOwnerChanged signal" );
67c75
<         fprintf( stderr, "Agent has been terminated\n" );
---
>         ERROR( stderr, "Agent has been terminated\n" );
86c94
<         fprintf( stderr, "Can't create reply message\n") ;
---
>         ERROR( stderr, "Can't create reply message\n") ;
108c116
<         fprintf( stderr, "Invalid arguments for passkey Confirm method" );
---
>         ERROR( stderr, "Invalid arguments for passkey Confirm method" );
117c125
<         fprintf( stderr, "Can't create reply message\n" );
---
>         ERROR( stderr, "Can't create reply message\n" );
136c144
<         fprintf( stderr, "Invalid arguments for Release method" );
---
>         ERROR( stderr, "Invalid arguments for Release method" );
142c150
<         fprintf( stderr, "Agent has been released\n" );
---
>         ERROR( stderr, "Agent has been released\n" );
150c158
<         fprintf( stderr, "Can't create reply message\n" );
---
>         ERROR( stderr, "Can't create reply message\n" );
165c173
<     printf( "%s - Agent_message was called!\n", MODULE_NAME );
---
>     LOG( "%s - Agent_message was called!\n", MODULE_NAME );
169c177
<         printf("%s - Agent called: Release\n", MODULE_NAME );
---
>         LOG("%s - Agent called: Release\n", MODULE_NAME );
172a181,186
>     if( dbus_message_is_method_call(msg, "org.bluez.Agent", "Cancel" ))
>     {
>         LOG("%s - Agent called: Cancel\n", MODULE_NAME );
>         return cancel_message( conn, msg, data );
>     }
> 
175c189
<         printf("%s - Agent called: RequestPinCode\n", MODULE_NAME );
---
>         LOG("%s - Agent called: RequestPinCode\n", MODULE_NAME );
178a193
> #if( __DEBUG__ )
181c196
<         printf("%s - Agent called: RequestPasskey\n", MODULE_NAME );
---
>         LOG("%s - Agent called: RequestPasskey\n", MODULE_NAME );
186c201
<         printf("%s - Agent called: DisplayPasskey\n", MODULE_NAME );
---
>         LOG("%s - Agent called: DisplayPasskey\n", MODULE_NAME );
191c206
<         printf("%s - Agent called: RequestConfirmation\n", MODULE_NAME );
---
>         LOG("%s - Agent called: RequestConfirmation\n", MODULE_NAME );
196c211
<         printf("%s - Agent called: Authorize\n", MODULE_NAME );
---
>         LOG("%s - Agent called: Authorize\n", MODULE_NAME );
201c216
<         printf("%s - Agent called: ConfirmModeChange\n", MODULE_NAME );
---
>         LOG("%s - Agent called: ConfirmModeChange\n", MODULE_NAME );
202a218
> #endif
204,209d219
<     if( dbus_message_is_method_call(msg, "org.bluez.Agent", "Cancel" ))
<     {
<         printf("%s - Agent called: Cancel\n", MODULE_NAME );
<         return cancel_message( conn, msg, data );
<     }
< 
225c235
<         fprintf( stderr, "Can't register object path for agent\n" );
---
>         ERROR( stderr, "Can't register object path for agent\n" );
232c242
<         fprintf( stderr, "Can't allocate new method call\n" );
---
>         ERROR( stderr, "Can't allocate new method call\n" );
246c256
<         fprintf( stderr, "Can't register agent\n" );
---
>         ERROR( stderr, "Can't register agent\n" );
249c259
<             fprintf( stderr, "%s\n", err.message );
---
>             ERROR( stderr, "%s\n", err.message );
270c280
<         fprintf( stderr, "Can't allocate new method call\n" );
---
>         ERROR( stderr, "Can't allocate new method call\n" );
284c294
<         fprintf( stderr, "Can't unregister agent\n" );
---
>         ERROR( stderr, "Can't unregister agent\n" );
287c297
<             fprintf( stderr, "%s\n", err.message );
---
>             ERROR( stderr, "%s\n", err.message );
311c321
<         fprintf( stderr, "Can't allocate new method call\n" );
---
>         ERROR( stderr, "Can't allocate new method call\n" );
323c333
<         fprintf( stderr, "Can't get Adapter path\n" );
---
>         ERROR( stderr, "Can't get Adapter path\n" );
326c336
<             fprintf( stderr, "%s\n", err.message );
---
>             ERROR( stderr, "%s\n", err.message );
344d353
< 
346,347c355,356
<         "\tagent [--device interface] [--path agent-path] <passkey>\n"
<         "\n" );
---
>             "\tagent [--device interface] [--path agent-path] <passkey>\n"
>             "\n" );
373,374c382,383
<     printf( "Bluetooth agent ver %s\n\n", VERSION );
<     printf( "%s - default_path: %s\n", MODULE_NAME, default_path );
---
>     LOG( "Bluetooth agent ver %s\n\n", VERSION );
>     LOG( "%s - default_path: %s\n", MODULE_NAME, default_path );
386c395
<                     fprintf( stderr, "Invalid path\n" );
---
>                     ERROR( stderr, "Invalid path\n" );
407c416
<     printf( "%s - passkey: %s\n", MODULE_NAME, passkey );
---
>     LOG( "%s - passkey: %s\n", MODULE_NAME, passkey );
412c421
<         printf("%s - agent_path: %s\n", MODULE_NAME, agent_path);
---
>         LOG("%s - agent_path: %s\n", MODULE_NAME, agent_path);
418c427
<         fprintf(stderr, "Can't get on system bus" );
---
>         ERROR(stderr, "Can't get on system bus" );
425c434
<         printf( "%s - device_path: %s\n", MODULE_NAME, device_path );
---
>         LOG( "%s - device_path: %s\n", MODULE_NAME, device_path );
436c445
<         fprintf( stderr, "Can't add signal filter" );
---
>         ERROR( stderr, "Can't add signal filter" );
==== bluez-4.22/tools/hciattach_ti.c#1
161c161
< 		fprintf(stderr, "bts_next_action: not enough space to read next action\n");
---
> 		fprintf(stderr, "bts_next_action: not enough space to read next action (action_hdr.size: %d - buf_size: %d)\n", action_hdr.size, buf_size);
387c387
< 	static uint8_t brf_action[270];
---
> 	static uint8_t brf_action[512];
396c396
< 			fprintf(stderr, "Warning: cannot find BTS file: %s\n",
---
> 			fprintf(stderr, "ERROR: cannot find BTS file: %s\n",
398c398
< 			return 0;
---
> 			return -1;
406,407c406,407
< 			fprintf(stderr, "Warning: BTS file is empty !");
< 			return 0;
---
> 			fprintf(stderr, "ERROR: BTS file is empty !");
> 			return -1;
453a454,478
>     /* Send a soft reset command */
>     cmd[0] = HCI_COMMAND_PKT;
>     cmd[1] = 0x03;
>     cmd[2] = 0x0c;
>     cmd[3] = 0x00;
>     do {
>          n = write(fd, cmd, 4);
>          if (n < 0) {
>              perror("Failed to write command (HCI_RESET)");
>              return -1;
>          }
>          if (n < 4) {
>              fprintf(stderr, "Wanted to write 4 bytes, could only write %d. Stop\n", n);
>              return -1;
>          }
> 
>          /* Read reply. */
>          if (read_hci_event(fd, resp, 100) < 0) {
>              perror("Failed to read init response (HCI_RESET)");
>              return -1;
>          }
> 
>          /* Wait for command complete event for our Opcode */
>      } while (resp[4] != cmd[1] && resp[5] != cmd[2]);
> 
==== bluez-4.22/tools/sdptool.c#1
756c756
< static int set_attrib(sdp_session_t *sess, uint32_t handle, uint16_t attrib, char *value) 
---
> static int set_attrib(sdp_session_t *sess, uint32_t handle, uint16_t attrib, char *value)
783a784,791
> 	} else if (!strncasecmp(value, "h0x", 3)) {
> 		/* Int16 */
> 		uint16_t value_int16;
> 		value_int16 = strtoul(value + 3, NULL, 16);
> 		printf("Adding attrib 0x%X uint16 0x%X to record 0x%X\n",
> 			attrib, value_int16, handle);
> 
> 		sdp_attr_add_new(rec, attrib, SDP_UINT16, &value_int16);
786c794
< 		uint32_t value_int;  
---
> 		uint32_t value_int;
814c822
< static const char *set_help = 
---
> static const char *set_help =
873a882
> 	uint8_t uint16 = SDP_UINT16;
904a914,922
> 		} else if (!strncasecmp(argv[i], "h0x", 3)) {
> 			/* Int16 */
> 			uint16_t *value_int16 = (uint16_t *) malloc(sizeof(uint16_t));
> 			allocArray[i] = value_int16;
> 			*value_int16 = strtoul((argv[i]) + 3, NULL, 16);
> 
> 			printf("Adding uint16 0x%X to record 0x%X\n", *value_int16, handle);
> 			dtdArray[i] = &uint16;
> 			valueArray[i] = value_int16;
952c970
< static const char *seq_help = 
---
> static const char *seq_help =
1688c1706
< 	sdp_data_t *channel, *features;	
---
> 	sdp_data_t *channel, *features;
2182c2200
< 	const uint8_t hid_spec[] = { 
---
> 	const uint8_t hid_spec[] = {
2195,2198c2213,2216
< 		0x75, 0x08, 
< 		0x95, 0x01, 
< 		0x81, 0x01, 
< 		0x75, 0x01, 
---
> 		0x75, 0x08,
> 		0x95, 0x01,
> 		0x81, 0x01,
> 		0x75, 0x01,
2202c2220
< 		0x29, 0x05, 
---
> 		0x29, 0x05,
3458c3476
< static const char *add_help = 
---
> static const char *add_help =
3523c3541
< 	if (!arg) { 
---
> 	if (!arg) {
3562c3580
< static const char *del_help = 
---
> static const char *del_help =
3703c3721
< static const char *browse_help = 
---
> static const char *browse_help =
3769c3787
< static const char *search_help = 
---
> static const char *search_help =
3928c3946
< static const char *records_help = 
---
> static const char *records_help =
3997c4015
< static const char *get_help = 
---
> static const char *get_help =
==== bluez-4.22/ylwrap#1