Selaa lähdekoodia

Fixes from Zoltan regarding AMF mispellings and type errors.

git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@1348 fd59a12c-fef9-0310-b244-a6a79926bd2f
Steven Dake 19 vuotta sitten
vanhempi
commit
49c06ba23b
3 muutettua tiedostoa jossa 9 lisäystä ja 9 poistoa
  1. 1 1
      include/ipc_amf.h
  2. 6 6
      include/saAmf.h
  3. 2 2
      lib/amf.c

+ 1 - 1
include/ipc_amf.h

@@ -180,7 +180,7 @@ struct req_lib_amf_protectiongrouptrack {
 	mar_req_header_t header;
 	SaNameT csiName;
 	SaUint8T trackFlags;
-	SaAmfProtectionGroupNotificationT *notificationBufferAddress;
+	SaAmfProtectionGroupNotificationBufferT *notificationBufferAddress;
 };
 
 struct res_lib_amf_protectiongrouptrack {

+ 6 - 6
include/saAmf.h

@@ -187,8 +187,8 @@ typedef struct {
 
 typedef struct {
 	SaUint32T numberOfItems;
-	SaAmfProtectionGroupNotificationT *notificaton;
-} SaAmfProtectionGruopNotificationBufferT;
+	SaAmfProtectionGroupNotificationT *notification;
+} SaAmfProtectionGroupNotificationBufferT;
 
 typedef enum {
 	SA_AMF_NO_RECOMMENDATION = 1,
@@ -261,7 +261,7 @@ typedef void (*SaAmfExternalComponentCleanupCallbackT) (
 
 typedef void (*SaAmfProtectionGroupTrackCallbackT) (
 	const SaNameT *csiName,
-	SaAmfProtectionGroupNotificationT *notificationBuffer,
+	SaAmfProtectionGroupNotificationBufferT *notificationBuffer,
 	SaUint32T numberOfMembers,
 	SaAisErrorT error);
 
@@ -277,9 +277,9 @@ typedef struct {
 	SaAmfProtectionGroupTrackCallbackT
 		saAmfProtectionGroupTrackCallback;
 	SaAmfExternalComponentInstantiateCallbackT
-		saAmfProxiedComponentInstantiateCallback;
+		saAmfExternalComponentInstantiateCallback;
 	SaAmfExternalComponentCleanupCallbackT
-		saAmfProxiedComponentCleanupCallback;
+		saAmfExternalComponentCleanupCallback;
 } SaAmfCallbacksT;
 
 /*
@@ -383,7 +383,7 @@ saAmfProtectionGroupTrack (
 	SaAmfHandleT amfHandle,
 	const SaNameT *csiName,
 	SaUint8T trackFlags,
-	const SaAmfProtectionGroupNotificationT *notificationBuffer);
+	SaAmfProtectionGroupNotificationBufferT *notificationBuffer);
 
 SaAisErrorT
 saAmfProtectionGroupTrackStop (

+ 2 - 2
lib/amf.c

@@ -873,7 +873,7 @@ saAmfProtectionGroupTrack (
 	SaAmfHandleT amfHandle,
 	const SaNameT *csiName,
 	SaUint8T trackFlags,
-	const SaAmfProtectionGroupNotificationT *notificationBuffer)
+	SaAmfProtectionGroupNotificationBufferT *notificationBuffer)
 {
 	struct amfInstance *amfInstance;
 	struct req_lib_amf_protectiongrouptrack req_lib_amf_protectiongrouptrack;
@@ -885,7 +885,7 @@ saAmfProtectionGroupTrack (
 	memcpy (&req_lib_amf_protectiongrouptrack.csiName, csiName,
 		sizeof (SaNameT));
 	req_lib_amf_protectiongrouptrack.trackFlags = trackFlags;
-	req_lib_amf_protectiongrouptrack.notificationBufferAddress = (SaAmfProtectionGroupNotificationT *)notificationBuffer;
+	req_lib_amf_protectiongrouptrack.notificationBufferAddress = (SaAmfProtectionGroupNotificationBufferT *)notificationBuffer;
 
 	error = saHandleInstanceGet (&amfHandleDatabase, amfHandle,
 		(void *)&amfInstance);