From 957842d966592f1c470fe314a9841bc27fe9c5dc Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Thu, 29 Nov 2007 16:11:43 +0000 Subject: [PATCH] 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) --- src/WINNT/afsd/afsd.h | 2 +- src/WINNT/afsd/cm_volstat.c | 27 +++++++++++++++++++++++++-- src/WINNT/afsd/cm_volstat.h | 28 ++++++++++++++++++++++++++-- src/WINNT/afsd/cm_volume.h | 2 -- 4 files changed, 52 insertions(+), 7 deletions(-) diff --git a/src/WINNT/afsd/afsd.h b/src/WINNT/afsd/afsd.h index 45b0b065e..218777fc1 100644 --- 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 9cb6cbf79..25af0c96e 100644 --- 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 69b30adae..877d37c70 100644 --- 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 26269709f..61b84d551 100644 --- 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 */ -- 2.39.5