DEVEL15-windows-volstat-headers-20071129

move the enum volstat definition to cm_volstat.h from cm_volume.h.

fix the copyright.

(cherry picked from commit 7da027754463f7040c89b6a04c35d13d5fbe31d3)

diff --git a/src/WINNT/afsd/afsd.h b/src/WINNT/afsd/afsd.h
index 45b0b065ebb0eac0201ff372854baed9eec27852..218777fc10011dd457d3d3121de210e1abd6d4a4 100644 (file)
--- a/src/WINNT/afsd/afsd.h
+++ b/src/WINNT/afsd/afsd.h
@@ -49,8 +49,8 @@ BOOL APIENTRY About(HWND, unsigned int, unsigned int, long);
 #include "cm_aclent.h"
 #include "cm_server.h"
 #include "cm_cell.h"
-#include "cm_volume.h"
 #include "cm_volstat.h"
+#include "cm_volume.h"
 #include "cm_dcache.h"
 #include "cm_access.h"
 #include "cm_utils.h"

diff --git a/src/WINNT/afsd/cm_volstat.c b/src/WINNT/afsd/cm_volstat.c
index 9cb6cbf79aacd130b18ec1ab118de375a9e6e438..25af0c96ec1f3b07dc03e93533e6232ec5b78264 100644 (file)
--- a/src/WINNT/afsd/cm_volstat.c
+++ b/src/WINNT/afsd/cm_volstat.c
@@ -1,6 +1,29 @@
-/* Copyright 2007 Secure Endpoints Inc.
+/* 
+ * Copyright (c) 2007 Secure Endpoints Inc.
  *
- * BSD 2-part License 
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions 
+ * are met:
+ * 
+ *     * Redistributions of source code must retain the above copyright 
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Neither the name of the Secure Endpoints Inc. nor the names of its 
+ *       contributors may be used to endorse or promote products derived 
+ *       from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS 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 ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 /* This source file provides the declarations 

diff --git a/src/WINNT/afsd/cm_volstat.h b/src/WINNT/afsd/cm_volstat.h
index 69b30adaed4c8678ad9d3966e60b3b2533a345e7..877d37c702d41f91c81e779e6434db23aebf9c02 100644 (file)
--- a/src/WINNT/afsd/cm_volstat.h
+++ b/src/WINNT/afsd/cm_volstat.h
@@ -1,6 +1,29 @@
-/* Copyright 2007 Secure Endpoints Inc.
+/* 
+ * Copyright (c) 2007 Secure Endpoints Inc.
  *
- * BSD 2-part License 
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions 
+ * are met:
+ * 
+ *     * Redistributions of source code must retain the above copyright 
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Neither the name of the Secure Endpoints Inc. nor the names of its 
+ *       contributors may be used to endorse or promote products derived 
+ *       from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS 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 ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 /* This header file provides the definitions and prototypes 
@@ -8,6 +31,7 @@
  * Notification API
  */
 
+enum volstatus {vl_online, vl_busy, vl_offline, vl_alldown, vl_unknown};
 
 extern long cm_VolStatus_Initialization(void);
 

diff --git a/src/WINNT/afsd/cm_volume.h b/src/WINNT/afsd/cm_volume.h
index 26269709f74a1f29645ec498d1e2a5887ca051cf..61b84d551d3b1761865aff47dae1fed29f4ad3d7 100644 (file)
--- a/src/WINNT/afsd/cm_volume.h
+++ b/src/WINNT/afsd/cm_volume.h
@@ -14,8 +14,6 @@
 
 #define CM_VOLUME_MAGIC    ('V' | 'O' <<8 | 'L'<<16 | 'M'<<24)
 
-enum volstatus {vl_online, vl_busy, vl_offline, vl_alldown, vl_unknown};
-
 typedef struct cm_vol_state {
     afs_uint32      ID;                 /* by mx */
     struct cm_volume *nextp;            /* volumeIDHashTable; by cm_volumeLock */