X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lib%2Fuuid%2Fpack.c;h=3db21aef691d02c79167ea5d924ec64402425445;hb=a7ea2ec02c096fc6deb36ee04f6c4c33b904b21f;hp=c4d03c8c43243f5cc9326b50476fe9ce2df2aa9b;hpb=19c78dc07fce2d6f39b5e541562afc3ca1ea38ff;p=tools%2Fe2fsprogs.git

diff --git a/lib/uuid/pack.c b/lib/uuid/pack.c
index c4d03c8..3db21ae 100644
--- a/lib/uuid/pack.c
+++ b/lib/uuid/pack.c
@@ -1,20 +1,44 @@
 /*
  * Internal routine for packing UUID's
- * 
+ *
  * Copyright (C) 1996, 1997 Theodore Ts'o.
  *
  * %Begin-Header%
- * This file may be redistributed under the terms of the GNU Public
- * License.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, and the entire permission notice in its entirety,
+ *    including the disclaimer of warranties.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote
+ *    products derived from this software without specific prior
+ *    written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF
+ * WHICH ARE HEREBY DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ * USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
  * %End-Header%
  */
 
+#include "config.h"
 #include <string.h>
 #include "uuidP.h"
 
-void uuid_pack(struct uuid *uu, uuid_t ptr)
+void uuid_pack(const struct uuid *uu, uuid_t ptr)
 {
-	__u32	tmp;
+	uint32_t	tmp;
 	unsigned char	*out = ptr;
 
 	tmp = uu->time_low;
@@ -25,7 +49,7 @@ void uuid_pack(struct uuid *uu, uuid_t ptr)
 	out[1] = (unsigned char) tmp;
 	tmp >>= 8;
 	out[0] = (unsigned char) tmp;
-	
+
 	tmp = uu->time_mid;
 	out[5] = (unsigned char) tmp;
 	tmp >>= 8;