Merging upstream version 4.4.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 43 insertions, 43 deletions

diff --git a/epan/dissectors/asn1/cmip/cmip.cnf b/epan/dissectors/asn1/cmip/cmip.cnf
index 0b547579..075293fe 100644
--- a/epan/dissectors/asn1/cmip/cmip.cnf
+++ b/epan/dissectors/asn1/cmip/cmip.cnf
@@ -228,7 +228,7 @@ RejectProblem
 #.END
 
 #.FN_BODY CMIPAbortSource  VAL_PTR = &value
-  guint32 value;
+  uint32_t value;
 
   %(DEFAULT_BODY)s
   col_append_fstr(actx->pinfo->cinfo, COL_INFO, " AbortSource:%%s", val_to_str(value, cmip_CMIPAbortSource_vals, " Unknown AbortSource:%%d"));
@@ -265,11 +265,11 @@ RejectProblem
 
 #.FN_BODY AttributeId/globalForm  FN_VARIANT = _str  VAL_PTR = &actx->external.direct_reference
   %(DEFAULT_BODY)s
-  actx->external.direct_ref_present = (actx->external.direct_reference != NULL) ? TRUE : FALSE;
+  actx->external.direct_ref_present = (actx->external.direct_reference != NULL) ? true : false;
 
 #.FN_BODY AttributeId/localForm  VAL_PTR = &actx->external.indirect_reference
   %(DEFAULT_BODY)s
-  actx->external.indirect_ref_present = TRUE;
+  actx->external.indirect_ref_present = true;
 
 #.FN_BODY Attribute/value
   if(actx->external.direct_ref_present){
@@ -285,7 +285,7 @@ RejectProblem
 	FN_VARIANT = _str  VAL_PTR = &actx->external.direct_reference
 
 #.FN_FTR AttributeValueAssertion/id
-  actx->external.direct_ref_present = (actx->external.direct_reference != NULL) ? TRUE : FALSE;
+  actx->external.direct_ref_present = (actx->external.direct_reference != NULL) ? true : false;
 
 #.FN_BODY AttributeValueAssertion/value
   if (actx->external.direct_ref_present) {
@@ -295,37 +295,37 @@ RejectProblem
 #.FN_BODY Invoke/argument
     switch(opcode){
     case 0: /* M-eventreport */
-      offset = dissect_cmip_EventReportArgument(FALSE, tvb, offset, actx, tree, -1);
+      offset = dissect_cmip_EventReportArgument(false, tvb, offset, actx, tree, -1);
       break;
     case 1: /* M-eventreport-confirmed */
-      offset = dissect_cmip_EventReportArgument(FALSE, tvb, offset, actx, tree, -1);
+      offset = dissect_cmip_EventReportArgument(false, tvb, offset, actx, tree, -1);
       break;
     case 2: /* M-linkedreply */
-      offset = dissect_cmip_LinkedReplyArgument(FALSE, tvb, offset, actx, tree, -1);
+      offset = dissect_cmip_LinkedReplyArgument(false, tvb, offset, actx, tree, -1);
       break;
     case 3: /* M-get */
-      offset = dissect_cmip_GetArgument(FALSE, tvb, offset,actx, tree, -1);
+      offset = dissect_cmip_GetArgument(false, tvb, offset,actx, tree, -1);
       break;
     case 4: /* M-set */
-      offset = dissect_cmip_SetArgument(FALSE, tvb, offset,actx, tree, -1);
+      offset = dissect_cmip_SetArgument(false, tvb, offset,actx, tree, -1);
       break;
     case 5: /* M-set-confirmed */
-      offset = dissect_cmip_SetArgument(FALSE, tvb, offset,actx, tree, -1);
+      offset = dissect_cmip_SetArgument(false, tvb, offset,actx, tree, -1);
       break;
     case 6: /* M-action*/
-      offset = dissect_cmip_ActionArgument(FALSE, tvb,  offset, actx, tree, -1);
+      offset = dissect_cmip_ActionArgument(false, tvb,  offset, actx, tree, -1);
       break;
     case 7: /* M-action-confirmed*/
-      offset = dissect_cmip_ActionArgument(FALSE, tvb,  offset, actx, tree, -1);
+      offset = dissect_cmip_ActionArgument(false, tvb,  offset, actx, tree, -1);
       break;
     case 8: /* M-create*/
-      offset = dissect_cmip_CreateArgument(FALSE, tvb,  offset, actx, tree, -1);
+      offset = dissect_cmip_CreateArgument(false, tvb,  offset, actx, tree, -1);
       break;
     case 9: /* M-delete*/
-      offset = dissect_cmip_DeleteArgument(FALSE, tvb,  offset, actx, tree, -1);
+      offset = dissect_cmip_DeleteArgument(false, tvb,  offset, actx, tree, -1);
       break;
     case 10: /* M-cancelget */
-      offset = dissect_cmip_InvokeIDType(FALSE, tvb,  offset, actx, tree, -1);
+      offset = dissect_cmip_InvokeIDType(false, tvb,  offset, actx, tree, -1);
       break;
     }
 
@@ -336,28 +336,28 @@ RejectProblem
     case 0: /* M-eventreport*/
       break;  /* No return data */
     case 1: /* M-eventreport-confirmed */
-      offset = dissect_cmip_EventReportResult(FALSE, tvb, offset, actx, tree, -1);
+      offset = dissect_cmip_EventReportResult(false, tvb, offset, actx, tree, -1);
       break;
     case 2: /* M-linkedreply*/
       break;  /* No return data */
     case 3: /* M-get */
-      offset = dissect_cmip_GetResult(FALSE, tvb, offset, actx, tree, -1);
+      offset = dissect_cmip_GetResult(false, tvb, offset, actx, tree, -1);
       break;
     case 4: /* M-set */
       break;  /* No return data */
     case 5: /* M-set-confirmed*/
-      offset = dissect_cmip_SetResult(FALSE, tvb, offset, actx, tree, -1);
+      offset = dissect_cmip_SetResult(false, tvb, offset, actx, tree, -1);
       break;
     case 6: /* M-action*/
       break;  /* No return data */
     case 7: /* M-action-confirmed*/
-      offset = dissect_cmip_ActionResult(FALSE, tvb, offset, actx, tree, -1);
+      offset = dissect_cmip_ActionResult(false, tvb, offset, actx, tree, -1);
       break;
     case 8: /* M-create*/
-      offset = dissect_cmip_CreateResult(FALSE, tvb,  offset, actx, tree, -1);
+      offset = dissect_cmip_CreateResult(false, tvb,  offset, actx, tree, -1);
       break;
     case 9: /* M-delete*/
-      offset = dissect_cmip_DeleteResult(FALSE, tvb,  offset, actx, tree, -1);
+      offset = dissect_cmip_DeleteResult(false, tvb,  offset, actx, tree, -1);
       break;
     case 10: /* M-cancelget */
       break; /* doe this one return any data? */
@@ -368,68 +368,68 @@ RejectProblem
 
     switch(opcode){
 	case 19: /* classInstanceConflict */
-		dissect_cmip_BaseManagedObjectId(FALSE, tvb,  offset, actx, tree, -1);
+		dissect_cmip_BaseManagedObjectId(false, tvb,  offset, actx, tree, -1);
 		break;
 	case 20:  /* complexityLimitation */
-		dissect_cmip_ComplexityLimitation(FALSE, tvb,  offset, actx, tree, -1);
+		dissect_cmip_ComplexityLimitation(false, tvb,  offset, actx, tree, -1);
 		break;
 	case 11: /* duplicateManagedObjectInstance */
-		dissect_cmip_ObjectInstance(FALSE, tvb,  offset, actx, tree, -1);
+		dissect_cmip_ObjectInstance(false, tvb,  offset, actx, tree, -1);
 		break;
 	case 7: /*  getListError */
-		dissect_cmip_GetListError(FALSE, tvb,  offset, actx, tree, -1);
+		dissect_cmip_GetListError(false, tvb,  offset, actx, tree, -1);
 		break;
 	case 15: /* invalidArgumentValue */
-		dissect_cmip_InvalidArgumentValue(FALSE, tvb,  offset, actx, tree, -1);
+		dissect_cmip_InvalidArgumentValue(false, tvb,  offset, actx, tree, -1);
 		break;
 	case 6: /* invalidAttributeValue */
-		dissect_cmip_Attribute(FALSE, tvb,  offset, actx, tree, -1);
+		dissect_cmip_Attribute(false, tvb,  offset, actx, tree, -1);
 		break;
 	case 4: /* invalidFilter */
-		dissect_cmip_CMISFilter(FALSE, tvb,  offset, actx, tree, -1);
+		dissect_cmip_CMISFilter(false, tvb,  offset, actx, tree, -1);
 		break;
 	case 17: /* invalidObjectInstance */
-		dissect_cmip_ObjectInstance(FALSE, tvb,  offset, actx, tree, -1);
+		dissect_cmip_ObjectInstance(false, tvb,  offset, actx, tree, -1);
 		break;
 	case 16: /* invalidScope */
-		dissect_cmip_Scope(FALSE, tvb,  offset, actx, tree, -1);
+		dissect_cmip_Scope(false, tvb,  offset, actx, tree, -1);
 		break;
 	case 18: /* missingAttributeValue */
 		/* Hmmm  SET OF AttributeId */
-		dissect_cmip_PAR_missingAttributeValue(FALSE, tvb,  offset, actx, tree, -1);
+		dissect_cmip_PAR_missingAttributeValue(false, tvb,  offset, actx, tree, -1);
 		break;
 	case 9: /* noSuchAction */
-		dissect_cmip_NoSuchAction(FALSE, tvb,  offset, actx, tree, -1);
+		dissect_cmip_NoSuchAction(false, tvb,  offset, actx, tree, -1);
 		break;
 	case 14: /* noSuchArgument */
-		dissect_cmip_NoSuchArgument(FALSE, tvb,  offset, actx, tree, -1);
+		dissect_cmip_NoSuchArgument(false, tvb,  offset, actx, tree, -1);
 		break;
 	case 5: /* noSuchAttribute */
-		dissect_cmip_AttributeId(FALSE, tvb,  offset, actx, tree, -1);
+		dissect_cmip_AttributeId(false, tvb,  offset, actx, tree, -1);
 		break;
 	case 13: /* noSuchEventType */
-		dissect_cmip_NoSuchEventType(FALSE, tvb,  offset, actx, tree, -1);
+		dissect_cmip_NoSuchEventType(false, tvb,  offset, actx, tree, -1);
 		break;
 	case 22: /* noSuchInvokeId */
-		dissect_cmip_InvokeIDType(FALSE, tvb,  offset, actx, tree, -1);
+		dissect_cmip_InvokeIDType(false, tvb,  offset, actx, tree, -1);
 		break;
 	case 0: /* noSuchObjectClass */
-		dissect_cmip_ObjectClass(FALSE, tvb,  offset, actx, tree, -1);
+		dissect_cmip_ObjectClass(false, tvb,  offset, actx, tree, -1);
 		break;
 	case 1:/* noSuchObjectInstance */
-		dissect_cmip_ObjectInstance(FALSE, tvb,  offset, actx, tree, -1);
+		dissect_cmip_ObjectInstance(false, tvb,  offset, actx, tree, -1);
 		break;
 	case 12: /* noSuchReferenceObject */
-		dissect_cmip_ObjectInstance(FALSE, tvb,  offset, actx, tree, -1);
+		dissect_cmip_ObjectInstance(false, tvb,  offset, actx, tree, -1);
 		break;
-	case 10: /* processingFailure OPTIONAL   TRUE*/
-		dissect_cmip_ProcessingFailure(FALSE, tvb,  offset, actx, tree, -1);
+	case 10: /* processingFailure OPTIONAL   true*/
+		dissect_cmip_ProcessingFailure(false, tvb,  offset, actx, tree, -1);
 		break;
 	case 8: /* setListError */
-		dissect_cmip_SetListError(FALSE, tvb,  offset, actx, tree, -1);
+		dissect_cmip_SetListError(false, tvb,  offset, actx, tree, -1);
 		break;
 	case 3:/* syncNotSupported */
-		dissect_cmip_CMISSync(FALSE, tvb,  offset, actx, tree, -1);
+		dissect_cmip_CMISSync(false, tvb,  offset, actx, tree, -1);
 		break;
 	}