Formatting in radius_xlat_move

FreeRADIUS · Apr 22, 2014 · 49718f7 · 49718f7
1 parent 83badf8
commit 49718f7
Showing 1 changed file with 62 additions and 64 deletions.
diff --git a/src/main/valuepair.c b/src/main/valuepair.c
@@ -608,7 +608,6 @@ int radius_xlat_do(REQUEST *request, VALUE_PAIR *vp)
 
 	len = radius_xlat(buffer, sizeof(buffer), request, vp->value.xlat, NULL, NULL);
 
-
 	rad_const_free(vp->value.xlat);
 	vp->value.xlat = NULL;
 	if (len < 0) {
@@ -652,7 +651,7 @@ void radius_xlat_move(REQUEST *request, VALUE_PAIR **to, VALUE_PAIR **from)
 		/*
 		 *	Don't move 'fallthrough' over.
 		 */
-		if (!i->da->vendor && i->da->attr == PW_FALL_THROUGH) {
+		if ((i->da->vendor == 0) && (i->da->attr == PW_FALL_THROUGH)) {
 			tailfrom = i;
 			continue;
 		}
@@ -665,74 +664,73 @@ void radius_xlat_move(REQUEST *request, VALUE_PAIR **to, VALUE_PAIR **from)
 
 		found = pairfind(*to, i->da->attr, i->da->vendor, TAG_ANY);
 		switch (i->op) {
-
-			/*
-			 *	If a similar attribute is found,
-			 *	delete it.
-			 */
-			case T_OP_SUB:		/* -= */
-				if (found) {
-					if (!i->vp_strvalue[0] ||
-				    	    (strcmp(found->vp_strvalue,
-					    	    i->vp_strvalue) == 0)) {
-				  		pairdelete(to, found->da->attr,
-				  			found->da->vendor,
-				  			found->tag);
-
-					/*
-					 *	'tailto' may have been
-					 *	deleted...
-					 */
-					tailto = to;
-					for (j = *to; j; j = j->next) {
-						tailto = &j->next;
-					}
+		/*
+		 *	If a similar attribute is found,
+		 *	delete it.
+		 */
+		case T_OP_SUB:		/* -= */
+			if (found) {
+				if (!i->vp_strvalue[0] ||
+				    (strcmp(found->vp_strvalue,
+					    i->vp_strvalue) == 0)) {
+					pairdelete(to, found->da->attr,
+						found->da->vendor,
+						found->tag);
+
+				/*
+				 *	'tailto' may have been
+				 *	deleted...
+				 */
+				tailto = to;
+				for (j = *to; j; j = j->next) {
+					tailto = &j->next;
 				}
 			}
-			tailfrom = i;
-			continue;
+		}
+		tailfrom = i;
+		continue;
 
-			/*
-			 *	Add it, if it's not already there.
-			 */
-			case T_OP_EQ:		/* = */
-				if (found) {
-					tailfrom = i;
-					continue; /* with the loop */
-				}
-				break;
+		/*
+		 *	Add it, if it's not already there.
+		 */
+		case T_OP_EQ:		/* = */
+			if (found) {
+				tailfrom = i;
+				continue; /* with the loop */
+			}
+			break;
 
-			/*
-			 *	If a similar attribute is found,
-			 *	replace it with the new one.  Otherwise,
-			 *	add the new one to the list.
-			 */
-			case T_OP_SET:		/* := */
-				if (found) {
-					VALUE_PAIR *vp;
-
-					vp = found->next;
-					memcpy(found, i, sizeof(*found));
-					found->next = vp;
-					tailfrom = i;
-					continue;
-				}
-				break;
+		/*
+		 *	If a similar attribute is found,
+		 *	replace it with the new one.  Otherwise,
+		 *	add the new one to the list.
+		 */
+		case T_OP_SET:		/* := */
+			if (found) {
+				VALUE_PAIR *vp;
+
+				vp = found->next;
+				memcpy(found, i, sizeof(*found));
+				found->next = vp;
+				tailfrom = i;
+				continue;
+			}
+			break;
 
-			/*
-			 *	FIXME: Add support for <=, >=, <, >
-			 *
-			 *	which will mean (for integers)
-			 *	'make the attribute the smaller, etc'
-			 */
+		/*
+		 *	FIXME: Add support for <=, >=, <, >
+		 *
+		 *	which will mean (for integers)
+		 *	'make the attribute the smaller, etc'
+		 */
 
-			/*
-			 *  Add the new element to the list, even
-			 *  if similar ones already exist.
-			 */
-			default:
-			case T_OP_ADD:		/* += */
-				break;
+		/*
+		 *  Add the new element to the list, even
+		 *  if similar ones already exist.
+		 */
+		default:
+		case T_OP_ADD:		/* += */
+			break;
 		}
 
 		if (tailfrom) {