X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=cause.c;h=3b9ae8d7e4f34eb7968a67705134cadfa95de292;hp=42fdb29bb4610adf3c9b29f6b30bd5ca1539047c;hb=5a7b2b52008bbd8d64c6b1fe6a1f7398312afb5d;hpb=ef3fc1931a2fa82f482d21fb1296735206463d3a

diff --git a/cause.c b/cause.c
index 42fdb29..3b9ae8d 100644
--- a/cause.c
+++ b/cause.c
@@ -9,10 +9,13 @@
 **                                                                           **
 \*****************************************************************************/ 
 
-#include "stdio.h"
-#include "sys/types.h"
-#include "string.h"
-#include "main.h"
+#include <stdio.h>
+#include <stdarg.h>
+#include <string.h>
+#include <stdlib.h>
+#include "macro.h"
+#include "cause.h"
+#include "extension.h"
 
 struct isdn_cause isdn_cause[128] = {
 			/********************************* - **/ /*38*/
@@ -337,8 +340,7 @@ char *get_isdn_cause(int cause, int location, int type)
 	if (cause<0 || cause>127)
 		cause = 0;
 
-	switch(type)
-	{
+	switch(type) {
 		case DISPLAY_CAUSE_NUMBER:
 		SPRINT(result, "Cause %d", cause);
 		break;
@@ -380,33 +382,31 @@ char *get_isdn_cause(int cause, int location, int type)
  */
 void collect_cause(int *multicause, int *multilocation, int newcause, int newlocation)
 {
-	if (newcause == CAUSE_REJECTED) /* call rejected */
-	{
+	if (newcause == CAUSE_REJECTED) { /* call rejected */
 		*multicause = newcause;
 		*multilocation = newlocation;
 	} else
-	if (newcause==CAUSE_NORMAL && *multicause!=CAUSE_REJECTED) /* reject via hangup */
-	{
+	if (newcause==CAUSE_NORMAL && *multicause!=CAUSE_REJECTED) { /* reject via hangup */
 		*multicause = newcause;
 		*multilocation = newlocation;
 	} else
-	if (newcause==CAUSE_BUSY && *multicause!=CAUSE_REJECTED && *multicause!=CAUSE_NORMAL) /* busy */
-	{
+	if (newcause==CAUSE_BUSY && *multicause!=CAUSE_REJECTED && *multicause!=CAUSE_NORMAL) { /* busy */
 		*multicause = newcause;
 		*multilocation = newlocation;
 	} else
-	if (newcause==CAUSE_OUTOFORDER && *multicause!=CAUSE_BUSY && *multicause!=CAUSE_REJECTED && *multicause!=CAUSE_NORMAL) /* no L1 */
-	{
+	if (newcause==CAUSE_OUTOFORDER && *multicause!=CAUSE_BUSY && *multicause!=CAUSE_REJECTED && *multicause!=CAUSE_NORMAL) { /* no L1 */
 		*multicause = newcause;
 		*multilocation = newlocation;
 	} else
-	if (newcause!=CAUSE_NOUSER && *multicause!=CAUSE_OUTOFORDER && *multicause!=CAUSE_BUSY && *multicause!=CAUSE_REJECTED && *multicause!=CAUSE_NORMAL) /* anything but not 18 */
-	{
+	if (newcause!=CAUSE_NOUSER && *multicause!=CAUSE_OUTOFORDER && *multicause!=CAUSE_BUSY && *multicause!=CAUSE_REJECTED && *multicause!=CAUSE_NORMAL) { /* anything but not 18 */
 		*multicause = newcause;
 		*multilocation = newlocation;
 	} else
-	if (newcause==CAUSE_NOUSER && *multicause==CAUSE_NOUSER) /* cause 18, but no cause yet, use the location */
-	{
+	if (newcause==CAUSE_NOUSER && *multicause==CAUSE_NOUSER) { /* cause 18, use the location */
+		*multilocation = newlocation;
+	} else
+	if (*multicause==0) { /* no cause yet, use newcause (should be 18) */
+		*multicause = newcause;
 		*multilocation = newlocation;
 	}
 }