diff options
| author | Russell Bryant <russell@russellbryant.com> | 2006-06-23 23:22:57 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2006-06-23 23:22:57 +0000 |
| commit | 1c17258f4ed6be55ab9349f723686ca24513c8cb (patch) | |
| tree | 125886d1c4468eb768cc7914b6db74fe39ac3320 /channels/chan_skinny.c | |
| parent | c8ceb92a4fe74ff05fc26b9da80ab2c17af5a931 (diff) | |
fix some little issues on big endian platforms to resolve compiler warnings
- don't call the byte swapping macros on single byte numbers
- don't do a ++ increment in the argument in the argument to the byte swapping
macros. This gets expanded to incrementing the variable 4 times in a single
operation, which results in undefined (and obviously undesired) behavior. :)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@35766 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_skinny.c')
| -rw-r--r-- | channels/chan_skinny.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c index 899bd13df..47f8cd038 100644 --- a/channels/chan_skinny.c +++ b/channels/chan_skinny.c @@ -3138,14 +3138,15 @@ static int handle_button_template_req_message(skinny_req *req, struct skinnysess switch (btn[i].buttonDefinition) { case BT_CUST_LINESPEEDDIAL: /* assume failure */ - req->data.buttontemplate.definition[i].buttonDefinition = htolel(BT_NONE); + req->data.buttontemplate.definition[i].buttonDefinition = BT_NONE; req->data.buttontemplate.definition[i].instanceNumber = htolel(0); for (l = d->lines; l; l = l->next) { if (l->instance == lineInstance) { ast_verbose("Adding button: %d, %d\n", BT_LINE, lineInstance); - req->data.buttontemplate.definition[i].buttonDefinition = htolel(BT_LINE); - req->data.buttontemplate.definition[i].instanceNumber = htolel(lineInstance++); + req->data.buttontemplate.definition[i].buttonDefinition = BT_LINE; + req->data.buttontemplate.definition[i].instanceNumber = htolel(lineInstance); + lineInstance++; buttonCount++; btnSet = 1; break; @@ -3156,8 +3157,9 @@ static int handle_button_template_req_message(skinny_req *req, struct skinnysess for (sd = d->speeddials; sd; sd = sd->next) { if (sd->instance == speeddialInstance) { ast_verbose("Adding button: %d, %d\n", BT_SPEEDDIAL, speeddialInstance); - req->data.buttontemplate.definition[i].buttonDefinition = htolel(BT_SPEEDDIAL); - req->data.buttontemplate.definition[i].instanceNumber = htolel(speeddialInstance++); + req->data.buttontemplate.definition[i].buttonDefinition = BT_SPEEDDIAL; + req->data.buttontemplate.definition[i].instanceNumber = htolel(speeddialInstance); + speeddialInstance++; buttonCount++; btnSet = 1; break; @@ -3172,8 +3174,9 @@ static int handle_button_template_req_message(skinny_req *req, struct skinnysess for (l = d->lines; l; l = l->next) { if (l->instance == lineInstance) { ast_verbose("Adding button: %d, %d\n", BT_LINE, lineInstance); - req->data.buttontemplate.definition[i].buttonDefinition = htolel(BT_LINE); - req->data.buttontemplate.definition[i].instanceNumber = htolel(lineInstance++); + req->data.buttontemplate.definition[i].buttonDefinition = BT_LINE; + req->data.buttontemplate.definition[i].instanceNumber = htolel(lineInstance); + lineInstance++; buttonCount++; btnSet = 1; break; @@ -3187,8 +3190,9 @@ static int handle_button_template_req_message(skinny_req *req, struct skinnysess for (sd = d->speeddials; sd; sd = sd->next) { if (sd->instance == speeddialInstance) { ast_verbose("Adding button: %d, %d\n", BT_SPEEDDIAL, speeddialInstance); - req->data.buttontemplate.definition[i].buttonDefinition = htolel(BT_SPEEDDIAL); - req->data.buttontemplate.definition[i].instanceNumber = htolel(speeddialInstance++); + req->data.buttontemplate.definition[i].buttonDefinition = BT_SPEEDDIAL; + req->data.buttontemplate.definition[i].instanceNumber = htolel(speeddialInstance); + speeddialInstance++; buttonCount++; btnSet = 1; break; |