[Asterisk-cvs] asterisk manager.c,1.22,1.23

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv897

Modified Files:
	manager.c 
Log Message:
Merge james' fixes


Index: manager.c
===================================================================
RCS file: /usr/cvsroot/asterisk/manager.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** manager.c	8 Sep 2003 22:01:02 -0000	1.22
--- manager.c	8 Sep 2003 23:40:33 -0000	1.23
***************
*** 151,155 ****
  	ast_mutex_lock(&s->lock);
  	ast_cli(s->fd, "Response: Error\r\n");
! 	if (id && &id)
  		ast_cli(s->fd, "ActionID: %s\r\n",id);
  	ast_cli(s->fd, "Message: %s\r\n\r\n", error);
--- 151,155 ----
  	ast_mutex_lock(&s->lock);
  	ast_cli(s->fd, "Response: Error\r\n");
! 	if (id && strlen(id))
  		ast_cli(s->fd, "ActionID: %s\r\n",id);
  	ast_cli(s->fd, "Message: %s\r\n\r\n", error);
***************
*** 162,166 ****
  	ast_mutex_lock(&s->lock);
  	ast_cli(s->fd, "Response: %s\r\n", resp);
! 	if (id && &id)
  		ast_cli(s->fd, "ActionID: %s\r\n",id);
  	if (msg)
--- 162,166 ----
  	ast_mutex_lock(&s->lock);
  	ast_cli(s->fd, "Response: %s\r\n", resp);
! 	if (id && strlen(id))
  		ast_cli(s->fd, "ActionID: %s\r\n",id);
  	if (msg)
***************
*** 322,326 ****
  	astman_send_ack(s, m, "Channel status will follow");
  	c = ast_channel_walk(NULL);
!         if (id && &id)
                  snprintf(idText,256,"ActionID: %s\r\n",id);
  	while(c) {
--- 322,326 ----
  	astman_send_ack(s, m, "Channel status will follow");
  	c = ast_channel_walk(NULL);
!         if (id && strlen(id))
                  snprintf(idText,256,"ActionID: %s\r\n",id);
  	while(c) {
***************
*** 469,473 ****
  		return 0;
  	}
!         if (id && &id)
                  snprintf(idText,256,"ActionID: %s\r\n",id);
  	ast_cli(s->fd, "Response: Success\r\n"
--- 469,473 ----
  		return 0;
  	}
!         if (id && strlen(id))
                  snprintf(idText,256,"ActionID: %s\r\n",id);
  	ast_cli(s->fd, "Response: Success\r\n"
***************
*** 490,494 ****
  	}
  	ast_app_messagecount(mailbox, &newmsgs, &oldmsgs);
!         if (id && &id) {
                  snprintf(idText,256,"ActionID: %s\r\n",id);
          }
--- 490,494 ----
  	}
  	ast_app_messagecount(mailbox, &newmsgs, &oldmsgs);
!         if (id && strlen(id)) {
                  snprintf(idText,256,"ActionID: %s\r\n",id);
          }
***************
*** 520,524 ****
  	status = ast_extension_state(NULL, context, exten);
  	ast_get_hint(hint, sizeof(hint) - 1, NULL, context, exten);
!         if (id && &id) {
                  snprintf(idText,256,"ActionID: %s\r\n",id);
          }
--- 520,524 ----
  	status = ast_extension_state(NULL, context, exten);
  	ast_get_hint(hint, sizeof(hint) - 1, NULL, context, exten);
!         if (id && strlen(id)) {
                  snprintf(idText,256,"ActionID: %s\r\n",id);
          }
***************
*** 577,581 ****
  		return 0;
  	}
!         if (id && *id) {
                  snprintf(idText,256,"ActionID: %s\r\n",id);
          }
--- 577,581 ----
  		return 0;
  	}
!         if (id && strlen(id)) {
                  snprintf(idText,256,"ActionID: %s\r\n",id);
          }