svn commit: lorikeet r216 - in trunk/ethereal: .

[tridge at samba.org]

Author: tridge
Date: 2005-01-27 06:32:36 +0000 (Thu, 27 Jan 2005)
New Revision: 216

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=lorikeet&rev=216

Log:
fixed to use hyper instead of HYPER_T
Modified:
   trunk/ethereal/eparser.c
   trunk/ethereal/eparser.h
   trunk/ethereal/libndr.h


Changeset:
Modified: trunk/ethereal/eparser.c
===================================================================
--- trunk/ethereal/eparser.c	2005-01-27 06:17:37 UTC (rev 215)
+++ trunk/ethereal/eparser.c	2005-01-27 06:32:36 UTC (rev 216)
@@ -177,8 +177,7 @@
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_pull_HYPER_T(struct pidl_pull *ndr, pidl_tree *tree, int hf, 
-			  HYPER_T *data)
+NTSTATUS ndr_pull_hyper(struct pidl_pull *ndr, pidl_tree *tree, int hf, uint64_t *data)
 {
 	ndr->offset = dissect_ndr_uint64(
 		ndr->tvb, ndr->offset, ndr->pinfo, tree->proto_tree,

Modified: trunk/ethereal/eparser.h
===================================================================
--- trunk/ethereal/eparser.h	2005-01-27 06:17:37 UTC (rev 215)
+++ trunk/ethereal/eparser.h	2005-01-27 06:32:36 UTC (rev 216)
@@ -34,9 +34,6 @@
 typedef uint32_t NTSTATUS;
 typedef uint32_t WERROR;
 typedef uint64_t NTTIME;
-typedef uint64_t NTTIME_hyper;
-typedef uint64_t NTTIME_1sec;
-typedef uint64_t HYPER_T;
 
 typedef struct data_blob
 {
@@ -123,7 +120,7 @@
 NTSTATUS ndr_pull_NTTIME(struct pidl_pull *ndr, pidl_tree *tree, int hf, NTTIME *data);
 NTSTATUS ndr_pull_NTTIME_1sec(struct pidl_pull *ndr, pidl_tree *tree, int hf, NTTIME *data);
 NTSTATUS ndr_pull_NTTIME_hyper(struct pidl_pull *ndr, pidl_tree *tree, int hf, NTTIME *data);
-NTSTATUS ndr_pull_HYPER_T(struct pidl_pull *ndr, pidl_tree *tree, int hf, HYPER_T *data);
+NTSTATUS ndr_pull_hyper(struct pidl_pull *ndr, pidl_tree *tree, int hf, uint64_t *data);
 void ndr_set_flags(uint32_t *pflags, uint32_t new_flags);
 NTSTATUS ndr_pull_ptr(struct pidl_pull *ndr, pidl_tree *tree, char *name, uint32_t *v);
 NTSTATUS ndr_pull_error(struct pidl_pull *ndr, 

Modified: trunk/ethereal/libndr.h
===================================================================
--- trunk/ethereal/libndr.h	2005-01-27 06:17:37 UTC (rev 215)
+++ trunk/ethereal/libndr.h	2005-01-27 06:32:36 UTC (rev 216)
@@ -198,27 +198,6 @@
 	} \
 } while(0)
 
-#define NDR_SIZE_ALIGN(t, n, flags) ((flags & LIBNDR_FLAG_NOALIGN)?(t):(((t) + (n-1)) & ~(n-1)))
-#define ndr_size_uint8(t, p, flags) (NDR_SIZE_ALIGN(t, 1, flags) + 1)
-#define ndr_size_uint16(t, p, flags) (NDR_SIZE_ALIGN(t, 2, flags) + 2)
-#define ndr_size_int32(t, p, flags) (NDR_SIZE_ALIGN(t, 4, flags) + 4)
-#define ndr_size_uint32(t, p, flags) (NDR_SIZE_ALIGN(t, 4, flags) + 4)
-#define ndr_size_ptr(t, p, flags) (NDR_SIZE_ALIGN(t, 4, flags) + 4)
-/* 
- * [u]int64 uses 4 Byte alignment
- * and HYPER_T uses 8 Byte alignment
- */
-#define ndr_size_int64(t, p, flags) (NDR_SIZE_ALIGN(t, 4, flags) + 8)
-#define ndr_size_uint64(t, p, flags) (NDR_SIZE_ALIGN(t, 4, flags) + 8)
-#define ndr_size_HYPER_T(t, p, flags) (NDR_SIZE_ALIGN(t, 8, flags) + 8)
-
-
-#define ndr_size_NTTIME(t, p, flags) ndr_size_uint64(t, p, flags)
-#define ndr_size_NTTIME_1sec(t, p, flags) ndr_size_HYPER_T(t, p, flags)
-
-#define ndr_size_WERROR(t, p, flags) ndr_size_uint32(t, p, flags)
-#define ndr_size_NTSTATUS(t, p, flags) ndr_size_uint32(t, p, flags)
-
 /* these are used to make the error checking on each element in libndr
    less tedious, hopefully making the code more readable */
 #define NDR_CHECK(call) do { NTSTATUS _status; \