From 3e2057542da6a0f182243b527bc7f1fd43d1fd3c Mon Sep 17 00:00:00 2001 From: Varun Shastry Date: Tue, 11 Sep 2012 16:34:54 +0530 Subject: All: License message change License message changed for server-side, dual license GPLV2 and LGPLv3+. Change-Id: Ia9e53061b9d2df3b3ef3bc9778dceff77db46a09 BUG: 852318 Signed-off-by: Varun Shastry Reviewed-on: http://review.gluster.org/3940 Tested-by: Gluster Build System Reviewed-by: Kaleb KEITHLEY Reviewed-by: Anand Avati --- xlators/bindings/python/src/gluster.py | 17 ++++++++--------- xlators/bindings/python/src/glusterstack.py | 15 +++++++-------- xlators/bindings/python/src/glustertypes.py | 17 ++++++++--------- xlators/bindings/python/src/python.c | 23 +++++++++++------------ xlators/bindings/python/src/testxlator.py | 2 +- 5 files changed, 35 insertions(+), 39 deletions(-) (limited to 'xlators/bindings/python/src') diff --git a/xlators/bindings/python/src/gluster.py b/xlators/bindings/python/src/gluster.py index 60bf3c9e..337c983e 100644 --- a/xlators/bindings/python/src/gluster.py +++ b/xlators/bindings/python/src/gluster.py @@ -1,12 +1,11 @@ -""" - Copyright (c) 2008-2012 Red Hat, Inc. - This file is part of GlusterFS. - - This file is licensed to you under your choice of the GNU Lesser - General Public License, version 3 or any later version (LGPLv3 or - later), or the GNU General Public License, version 2 (GPLv2), in all - cases as published by the Free Software Foundation. -""" + +# Copyright (c) 2007-2012 Red Hat, Inc. +# This file is part of GlusterFS. +# +# This file is licensed to you under your choice of the GNU Lesser +# General Public License, version 3 or any later version (LGPLv3 or +# later), or the GNU General Public License, version 2 (GPLv2), in all +# cases as published by the Free Software Foundation. from ctypes import * from glustertypes import * diff --git a/xlators/bindings/python/src/glusterstack.py b/xlators/bindings/python/src/glusterstack.py index 19da219f..0c071ae9 100644 --- a/xlators/bindings/python/src/glusterstack.py +++ b/xlators/bindings/python/src/glusterstack.py @@ -1,12 +1,11 @@ -""" - Copyright (c) 2008-2012 Red Hat, Inc. - This file is part of GlusterFS. - This file is licensed to you under your choice of the GNU Lesser - General Public License, version 3 or any later version (LGPLv3 or - later), or the GNU General Public License, version 2 (GPLv2), in all - cases as published by the Free Software Foundation. -""" +# Copyright (c) 2007-2012 Red Hat, Inc. +# This file is part of GlusterFS. +# +# This file is licensed to you under your choice of the GNU Lesser +# General Public License, version 3 or any later version (LGPLv3 or +# later), or the GNU General Public License, version 2 (GPLv2), in all +# cases as published by the Free Software Foundation. from ctypes import * from glustertypes import * diff --git a/xlators/bindings/python/src/glustertypes.py b/xlators/bindings/python/src/glustertypes.py index a75b7d09..98437d22 100644 --- a/xlators/bindings/python/src/glustertypes.py +++ b/xlators/bindings/python/src/glustertypes.py @@ -1,12 +1,11 @@ -""" - Copyright (c) 2008-2012 Red Hat, Inc. - This file is part of GlusterFS. - - This file is licensed to you under your choice of the GNU Lesser - General Public License, version 3 or any later version (LGPLv3 or - later), or the GNU General Public License, version 2 (GPLv2), in all - cases as published by the Free Software Foundation. -""" + +# Copyright (c) 2007-2012 Red Hat, Inc. +# This file is part of GlusterFS. +# +# This file is licensed to you under your choice of the GNU Lesser +# General Public License, version 3 or any later version (LGPLv3 or +# later), or the GNU General Public License, version 2 (GPLv2), in all +# cases as published by the Free Software Foundation. from ctypes import * import collections diff --git a/xlators/bindings/python/src/python.c b/xlators/bindings/python/src/python.c index 8ba008c2..9b96790d 100644 --- a/xlators/bindings/python/src/python.c +++ b/xlators/bindings/python/src/python.c @@ -1,13 +1,12 @@ /* - Copyright (c) 2008-2012 Red Hat, Inc. - This file is part of GlusterFS. + Copyright (c) 2008-2012 Red Hat, Inc. + This file is part of GlusterFS. - This file is licensed to you under your choice of the GNU Lesser - General Public License, version 3 or any later version (LGPLv3 or - later), or the GNU General Public License, version 2 (GPLv2), in all - cases as published by the Free Software Foundation. + This file is licensed to you under your choice of the GNU Lesser + General Public License, version 3 or any later version (LGPLv3 or + later), or the GNU General Public License, version 2 (GPLv2), in all + cases as published by the Free Software Foundation. */ - #include #ifndef _CONFIG_H @@ -36,7 +35,7 @@ python_writev (call_frame_t *frame, xlator_t *this, fd_t *fd, struct iovec *vector, - int32_t count, + int32_t count, off_t offset) { python_private_t *priv = (python_private_t *)this->private; @@ -139,7 +138,7 @@ init (xlator_t *this) Py_InitializeEx(0); if (!this->children) { - gf_log ("python", GF_LOG_ERROR, + gf_log ("python", GF_LOG_ERROR, "FATAL: python should have exactly one child"); return -1; } @@ -157,7 +156,7 @@ init (xlator_t *this) } priv->pInterp = Py_NewInterpreter(); - + // Adjust python's path PyObject *syspath = PySys_GetObject("path"); PyObject *path = PyString_FromString(GLUSTER_PYTHON_PATH); @@ -179,7 +178,7 @@ init (xlator_t *this) priv->pVectorType = PyObject_GetAttrString(priv->pGlusterModule, "iovec"); gf_log("python", GF_LOG_DEBUG, "Loading script...%s", priv->scriptname); - + priv->pScriptModule = AnonModule_FromFile(priv->scriptname); if (!priv->pScriptModule || PyErr_Occurred()) { @@ -208,7 +207,7 @@ init (xlator_t *this) return 0; } -void +void fini (xlator_t *this) { python_private_t *priv = (python_private_t*)(this->private); diff --git a/xlators/bindings/python/src/testxlator.py b/xlators/bindings/python/src/testxlator.py index 7f6d9f5d..59a991dc 100644 --- a/xlators/bindings/python/src/testxlator.py +++ b/xlators/bindings/python/src/testxlator.py @@ -1,5 +1,5 @@ """ - Copyright (c) 2008-2012 Red Hat, Inc. + Copyright (c) 2007-2012 Red Hat, Inc. This file is part of GlusterFS. This file is licensed to you under your choice of the GNU Lesser -- cgit