labs-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pque...@apache.org
Subject svn commit: r744590 - in /labs/orthrus/trunk: ./ LICENSE NOTICE SConstruct TOOD include/ include/orthrus.h include/orthrus_error.h include/private/ include/private/context.h src/ src/core.c src/error.c src/ortcalc.c
Date Sun, 15 Feb 2009 01:13:38 GMT
Author: pquerna
Date: Sun Feb 15 01:13:37 2009
New Revision: 744590

URL: http://svn.apache.org/viewvc?rev=744590&view=rev
Log:
Commit the skeleton for orthrus that i've had around for awhile.

Added:
    labs/orthrus/trunk/LICENSE
    labs/orthrus/trunk/NOTICE
    labs/orthrus/trunk/SConstruct
    labs/orthrus/trunk/TOOD
    labs/orthrus/trunk/include/
    labs/orthrus/trunk/include/orthrus.h   (with props)
    labs/orthrus/trunk/include/orthrus_error.h   (with props)
    labs/orthrus/trunk/include/private/
    labs/orthrus/trunk/include/private/context.h   (with props)
    labs/orthrus/trunk/src/   (with props)
    labs/orthrus/trunk/src/core.c   (with props)
    labs/orthrus/trunk/src/error.c   (with props)
    labs/orthrus/trunk/src/ortcalc.c   (with props)
Modified:
    labs/orthrus/trunk/   (props changed)

Propchange: labs/orthrus/trunk/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Feb 15 01:13:37 2009
@@ -0,0 +1,3 @@
+*orthrus-0.*
+build.py
+.sconsign*

Added: labs/orthrus/trunk/LICENSE
URL: http://svn.apache.org/viewvc/labs/orthrus/trunk/LICENSE?rev=744590&view=auto
==============================================================================
--- labs/orthrus/trunk/LICENSE (added)
+++ labs/orthrus/trunk/LICENSE Sun Feb 15 01:13:37 2009
@@ -0,0 +1,341 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
+
+APACHE PORTABLE RUNTIME SUBCOMPONENTS: 
+
+The Apache Portable Runtime includes a number of subcomponents with
+separate copyright notices and license terms. Your use of the source
+code for the these subcomponents is subject to the terms and
+conditions of the following licenses. 
+
+From strings/apr_fnmatch.c, include/apr_fnmatch.h, misc/unix/getopt.c,
+file_io/unix/mktemp.c, strings/apr_strings.c:
+
+/* 
+ * Copyright (c) 1987, 1993, 1994
+ *      The Regents of the University of California.  All rights reserved.
+ *
+ * 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, this list of conditions and the following disclaimer.
+ * 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. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *      This product includes software developed by the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University 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 REGENTS 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 REGENTS 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.
+
+From network_io/unix/inet_ntop.c, network_io/unix/inet_pton.c:
+
+/* Copyright (c) 1996 by Internet Software Consortium.
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
+ * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
+ * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ * SOFTWARE.
+
+From dso/aix/dso.c:
+
+ *  Based on libdl (dlfcn.c/dlfcn.h) which is
+ *  Copyright (c) 1992,1993,1995,1996,1997,1988
+ *  Jens-Uwe Mager, Helios Software GmbH, Hannover, Germany.
+ *
+ *  Not derived from licensed software.
+ *
+ *  Permission is granted to freely use, copy, modify, and redistribute
+ *  this software, provided that the author is not construed to be liable
+ *  for any results of using the software, alterations are clearly marked
+ *  as such, and this notice is not modified.
+
+From strings/apr_strnatcmp.c, include/apr_strings.h:
+
+  strnatcmp.c -- Perform 'natural order' comparisons of strings in C.
+  Copyright (C) 2000 by Martin Pool <mbp@humbug.org.au>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+From strings/apr_snprintf.c:
+
+  *
+  * cvt - IEEE floating point formatting routines.
+  *       Derived from UNIX V7, Copyright(C) Caldera International Inc.
+  *
+
+  Copyright(C) Caldera International Inc.  2001-2002.  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 and documentation must retain the above
+  copyright notice, this list of conditions and the following disclaimer.
+
+  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.
+
+  All advertising materials mentioning features or use of this software
+  must display the following acknowledgement:
+
+     This product includes software developed or owned by  Caldera
+     International, Inc.
+
+  Neither the name of Caldera International, Inc. nor the names of other
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+  USE OF THE SOFTWARE PROVIDED FOR UNDER THIS LICENSE BY CALDERA
+  INTERNATIONAL, INC. 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 CALDERA INTERNATIONAL, INC. 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.
+
+

Added: labs/orthrus/trunk/NOTICE
URL: http://svn.apache.org/viewvc/labs/orthrus/trunk/NOTICE?rev=744590&view=auto
==============================================================================
--- labs/orthrus/trunk/NOTICE (added)
+++ labs/orthrus/trunk/NOTICE Sun Feb 15 01:13:37 2009
@@ -0,0 +1,11 @@
+Apache Orthrus
+Copyright 2009 The Apache Software Foundation.
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+This product includes software developed by Justin Erenkrantz and Greg Stein.
+
+This product includes software developed by Garrett Rooney. 
+
+This product includes software developed by Paul Querna (http://paul.querna.org/).

Added: labs/orthrus/trunk/SConstruct
URL: http://svn.apache.org/viewvc/labs/orthrus/trunk/SConstruct?rev=744590&view=auto
==============================================================================
--- labs/orthrus/trunk/SConstruct (added)
+++ labs/orthrus/trunk/SConstruct Sun Feb 15 01:13:37 2009
@@ -0,0 +1,42 @@
+#
+#
+#
+
+EnsureSConsVersion(1, 2, 0)
+
+from os.path import join as pjoin
+opts = Variables('build.py')
+
+orthrus_major = 0
+orthrus_minor = 1
+orthrus_patch = 0
+
+opts.Add(PathVariable('PREFIX', 'Prefix of where to install', '/usr/local', validator=PathVariable.PathAccept))
+opts.Add(PathVariable('DESTDIR', 'Prefix for packaging purposes', '/', validator=PathVariable.PathAccept))
+opts.Add(PathVariable('APR', 'Path to apr-1-config', '/usr/local/bin/apr-1-config'))
+opts.Add(PathVariable('APRUTIL', 'Path apu-1-config', '/usr/local/bin/apu-1-config'))
+
+env = Environment(options=opts)
+
+env.ParseConfig(env['APR'] + ' --cflags --cppflags --includes --libs --ldflags --link-ld')
+env.ParseConfig(env['APRUTIL'] + ' --includes  --ldflags  --libs --link-ld')
+env.AppendUnique(CPPPATH = ["include"])
+
+if env['PLATFORM'] == 'darwin':
+    env.AppendUnique(LINKFLAGS = ['-undefined', 'dynamic_lookup'])
+
+lib = env.SharedLibrary(target='orthrus-0', source = ['src/core.c', 'src/error.c'])
+headers = env.Glob('include/*.h')
+appenv = env.Clone()
+appenv.AppendUnique(LIBS=lib)
+app = appenv.Program(source = ['src/ortcalc.c'])
+
+install = []
+install.extend(env.Install(pjoin(env['DESTDIR'], env['PREFIX'], 'bin'), app))
+install.extend(env.Install(pjoin(env['DESTDIR'], env['PREFIX'], 'lib'), lib))
+install.extend(env.Install(pjoin(env['DESTDIR'], env['PREFIX'], 'include', 'orthrus-0'),
headers))
+
+targets = [lib, app]
+env.Alias('install', install)
+env.Default(targets)
+

Added: labs/orthrus/trunk/TOOD
URL: http://svn.apache.org/viewvc/labs/orthrus/trunk/TOOD?rev=744590&view=auto
==============================================================================
--- labs/orthrus/trunk/TOOD (added)
+++ labs/orthrus/trunk/TOOD Sun Feb 15 01:13:37 2009
@@ -0,0 +1,3 @@
+- Add files required by the Labs PMC.
+- Make ortcalc work.
+- Clean up NOTICE file, parts of the error objects are based upon etl/subversion/proton,
which are all written by ASF committers.

Added: labs/orthrus/trunk/include/orthrus.h
URL: http://svn.apache.org/viewvc/labs/orthrus/trunk/include/orthrus.h?rev=744590&view=auto
==============================================================================
--- labs/orthrus/trunk/include/orthrus.h (added)
+++ labs/orthrus/trunk/include/orthrus.h Sun Feb 15 01:13:37 2009
@@ -0,0 +1,37 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef _APACHE_ORTHUS_H_
+#define _APACHE_ORTHUS_H_
+
+#include "apr.h"
+#include "orthrus_error.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Opaque Structure repersenting an Orthrus Structure */
+typedef struct orthrus_t orthrus_t;
+
+orthrus_error_t* orthrus_create(apr_pool_t *pool, orthrus_t **ort);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+
+#endif

Propchange: labs/orthrus/trunk/include/orthrus.h
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: labs/orthrus/trunk/include/orthrus.h
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: labs/orthrus/trunk/include/orthrus.h
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: labs/orthrus/trunk/include/orthrus_error.h
URL: http://svn.apache.org/viewvc/labs/orthrus/trunk/include/orthrus_error.h?rev=744590&view=auto
==============================================================================
--- labs/orthrus/trunk/include/orthrus_error.h (added)
+++ labs/orthrus/trunk/include/orthrus_error.h Sun Feb 15 01:13:37 2009
@@ -0,0 +1,111 @@
+/* Copyright 2006 Paul Querna
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+/**
+ * @file orthrus_error.h
+ * @brief Error Objects for Orthrus.
+ */
+
+#ifndef _APACHE_ORTHUS_ERROR_H_
+#define _APACHE_ORTHUS_ERROR_H_
+
+#include <apr.h>
+#include <apr_errno.h>
+#include <apr_pools.h>
+
+/* Based upon Protoon's Error Objects, which are based on ETL's, which are
+ * based on Subversion's.  You get the idea.
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/**
+ * Check if the @c orthrus_error_t returned by @a expression is equal to
+ * @c ORTHRUS_SUCCESS.  If it is, do nothing, if not, then return it.
+ */
+#define ORT_ERR(expression) do {              \
+    orthrus_error_t *ort__err = (expression); \
+    if (ort__err)                             \
+      return ort__err;                        \
+} while (0)
+
+/** Successful return value for a function that returns @c orthrus_error_t. */
+#define ORTHRUS_SUCCESS NULL
+
+/** An exception object. */
+typedef struct {
+    apr_status_t err;
+    const char *msg;
+    
+    apr_uint32_t line;
+    const char *file;
+    
+    apr_pool_t *pool;
+} orthrus_error_t;
+
+/**
+* Return a new @c orthrus_error_t with underlying @c apr_status_t @a err
+ * and message @a msg.
+ */
+#define orthrus_error_create(err, msg) orthrus_error_create_impl(err,      \
+                                                         msg,      \
+                                                         __LINE__, \
+                                                         __FILE__)
+
+/**
+* The underlying function that implements @c orthrus_error_create.
+ *
+ * This is an implementation detail, and should not be directly called
+ * by users.
+ */
+orthrus_error_t *
+orthrus_error_create_impl(apr_status_t err,
+                      const char *msg,
+                      apr_uint32_t line,
+                      const char *file);
+
+/**
+* Return a new @c orthrus_error_t with underlying @c apr_status_t @a err
+ * and message created @c printf style with @a fmt and varargs.
+ */
+#define orthrus_error_createf(err, fmt, ...) orthrus_error_createf_impl(err,         \
+                                                                  __LINE__,    \
+                                                                  __FILE__,    \
+                                                                  fmt,         \
+                                                                  __VA_ARGS__)
+
+/**
+* The underlying function that implements @c orthrus_error_createf.
+ *
+ * This is an implementation detail, and should not be directly called
+ * by users.
+ */
+orthrus_error_t *
+orthrus_error_createf_impl(apr_status_t err,
+                           apr_uint32_t line,
+                           const char *file,
+                           const char *fmt,
+                           ...);
+
+/** Destroy @a err. */
+void orthrus_error_destroy(orthrus_error_t *err);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* _APACHE_ORTHUS_ERROR_H_ */

Propchange: labs/orthrus/trunk/include/orthrus_error.h
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: labs/orthrus/trunk/include/orthrus_error.h
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: labs/orthrus/trunk/include/orthrus_error.h
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: labs/orthrus/trunk/include/private/context.h
URL: http://svn.apache.org/viewvc/labs/orthrus/trunk/include/private/context.h?rev=744590&view=auto
==============================================================================
--- labs/orthrus/trunk/include/private/context.h (added)
+++ labs/orthrus/trunk/include/private/context.h Sun Feb 15 01:13:37 2009
@@ -0,0 +1,36 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef _APACHE_ORTHUS_PRIVATE_CONTEXT_H_
+#define _APACHE_ORTHUS_PRIVATE_CONTEXT_H_
+
+#include "orthrus.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+struct orthrus_t {
+  apr_pool_t *pool;
+};
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+
+#endif

Propchange: labs/orthrus/trunk/include/private/context.h
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: labs/orthrus/trunk/include/private/context.h
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: labs/orthrus/trunk/include/private/context.h
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: labs/orthrus/trunk/src/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Feb 15 01:13:37 2009
@@ -0,0 +1,2 @@
+ortcalc
+*.os

Added: labs/orthrus/trunk/src/core.c
URL: http://svn.apache.org/viewvc/labs/orthrus/trunk/src/core.c?rev=744590&view=auto
==============================================================================
--- labs/orthrus/trunk/src/core.c (added)
+++ labs/orthrus/trunk/src/core.c Sun Feb 15 01:13:37 2009
@@ -0,0 +1,32 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "orthrus.h"
+#include "private/context.h"
+
+orthrus_error_t* orthrus_create(apr_pool_t *pool, orthrus_t **out_ort)
+{
+  orthrus_t *ort;
+  apr_pool_t *p;
+  apr_pool_create(&p, pool);
+
+  ort = apr_pcalloc(p, sizeof(orthrus_t));
+
+  *out_ort = ort;
+
+  return ORTHRUS_SUCCESS;
+}
+

Propchange: labs/orthrus/trunk/src/core.c
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: labs/orthrus/trunk/src/core.c
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: labs/orthrus/trunk/src/core.c
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: labs/orthrus/trunk/src/error.c
URL: http://svn.apache.org/viewvc/labs/orthrus/trunk/src/error.c?rev=744590&view=auto
==============================================================================
--- labs/orthrus/trunk/src/error.c (added)
+++ labs/orthrus/trunk/src/error.c Sun Feb 15 01:13:37 2009
@@ -0,0 +1,78 @@
+/* Copyright 2007 Paul Querna.
+ * Copyright 2006 Garrett Rooney.
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+
+#include "orthrus_error.h"
+
+orthrus_error_t*
+orthrus_error_create_impl(apr_status_t err,
+                          const char *msg,
+                          uint32_t line,
+                          const char *file)
+{
+    orthrus_error_t *e;
+    
+    e = malloc(sizeof(*e));
+
+    e->err = err;
+    e->msg = strdup(msg);
+    e->line = line;
+    e->file = strdup(file);
+    
+    return e;
+}
+
+orthrus_error_t *
+orthrus_error_createf_impl(apr_status_t err,
+                           uint32_t line,
+                           const char *file,
+                           const char *fmt,
+                           ...)
+{
+    orthrus_error_t *e;
+    va_list ap;
+
+    e = malloc(sizeof(*e));
+
+    e->err = err;
+
+    va_start(ap, fmt);
+    vasprintf((char **) &e->msg, fmt, ap);
+    va_end(ap);
+
+    e->line = line;
+    e->file = strdup(file);
+
+    return e;
+}
+
+void
+orthrus_error_destroy(orthrus_error_t *err)
+{
+    if (err) {
+        free((void *) err->msg);
+        free((void *) err->file);
+        free(err);
+    }
+}
+

Propchange: labs/orthrus/trunk/src/error.c
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: labs/orthrus/trunk/src/error.c
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: labs/orthrus/trunk/src/error.c
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: labs/orthrus/trunk/src/ortcalc.c
URL: http://svn.apache.org/viewvc/labs/orthrus/trunk/src/ortcalc.c?rev=744590&view=auto
==============================================================================
--- labs/orthrus/trunk/src/ortcalc.c (added)
+++ labs/orthrus/trunk/src/ortcalc.c Sun Feb 15 01:13:37 2009
@@ -0,0 +1,58 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "orthrus.h"
+#include "apr_file_io.h"
+
+#if APR_HAVE_STDLIB_H
+#include <stdlib.h> /* for atexit() */
+#endif
+
+
+#ifndef NL
+#define NL APR_EOL_STR
+#endif
+
+int main(int argc, const char * const argv[])
+{
+  apr_pool_t *pool;
+  apr_status_t rv = APR_SUCCESS;
+  apr_file_t *errfile;
+  orthrus_t *ort;
+  orthrus_error_t *err;
+
+  apr_app_initialize(&argc, &argv, NULL);
+  atexit(apr_terminate);
+
+  apr_pool_create(&pool, NULL);
+
+  rv = apr_file_open_stderr(&errfile, pool);
+  if (rv) {
+    fprintf(stderr, "Failed to open stderr: %d", rv);
+    return rv;
+  }
+  
+  err = orthrus_create(pool, &ort);
+
+  if (err) {
+    apr_file_printf(errfile, "[%s:%d] Failed to create orthrus instance: %s (%d)"NL,
+                    err->file, err->line, err->msg, err->err);
+    return 1;
+  }
+
+  return 0;
+}
+

Propchange: labs/orthrus/trunk/src/ortcalc.c
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: labs/orthrus/trunk/src/ortcalc.c
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: labs/orthrus/trunk/src/ortcalc.c
------------------------------------------------------------------------------
    svn:mime-type = text/plain



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org


Mime
View raw message