[Asterisk-code-review] app osplookup: Move header defines into the app. (asterisk[master])

Jenkins2 asteriskteam at digium.com
Sun Mar 11 17:24:31 CDT 2018


Jenkins2 has submitted this change and it was merged. ( https://gerrit.asterisk.org/8454 )

Change subject: app_osplookup: Move header defines into the app.
......................................................................

app_osplookup: Move header defines into the app.

astosp.h is leftover from when logic was split between app_osplookup and
res_osp.  All logic was moved into app_osplookup by 109737eb1c in 2006,
but astosp.h remained.  This moves the remaining defines into
app_osplookup and deletes astosp.h.

Change-Id: I0a6c4debd7c9543b608520b1765abfa4fab7b2fd
---
M apps/app_osplookup.c
D include/asterisk/astosp.h
2 files changed, 5 insertions(+), 32 deletions(-)

Approvals:
  Joshua Colp: Looks good to me, but someone else must approve
  Richard Mudgett: Looks good to me, but someone else must approve
  Kevin Harwell: Looks good to me, approved
  Jenkins2: Approved for Submit



diff --git a/apps/app_osplookup.c b/apps/app_osplookup.c
index c42e187..78f573a 100644
--- a/apps/app_osplookup.c
+++ b/apps/app_osplookup.c
@@ -50,7 +50,6 @@
 #include "asterisk/module.h"
 #include "asterisk/pbx.h"
 #include "asterisk/cli.h"
-#include "asterisk/astosp.h"
 
 /*** DOCUMENTATION
 	<application name="OSPAuth" language="en_US">
@@ -436,6 +435,11 @@
 	</application>
  ***/
 
+/* OSP Return statuses */
+#define AST_OSP_SUCCESS	((char*)"SUCCESS")	/* Return status, success */
+#define AST_OSP_FAILED	((char*)"FAILED")	/* Return status, failed */
+#define AST_OSP_ERROR	((char*)"ERROR")	/* Return status, error */
+
 /* OSP Buffer Sizes */
 #define OSP_SIZE_INTSTR		((unsigned int)16)			/* OSP signed/unsigned int string buffer size */
 #define OSP_SIZE_NORSTR		((unsigned int)256)			/* OSP normal string buffer size */
diff --git a/include/asterisk/astosp.h b/include/asterisk/astosp.h
deleted file mode 100644
index 4faa2b4..0000000
--- a/include/asterisk/astosp.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Asterisk -- An open source telephony toolkit.
- *
- * Copyright (C) 1999 - 2005, Digium, Inc.
- *
- * Mark Spencer <markster at digium.com>
- *
- * See http://www.asterisk.org for more information about
- * the Asterisk project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
- *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2. See the LICENSE file
- * at the top of the source tree.
- */
-
-/*!
- * \file
- * \brief Open Settlement Protocol (OSP)
- */
-
-#ifndef _ASTERISK_OSP_H
-#define _ASTERISK_OSP_H
-
-#define AST_OSP_SUCCESS	((char*)"SUCCESS")	/* Return status, success */
-#define AST_OSP_FAILED	((char*)"FAILED")	/* Return status, failed */
-#define AST_OSP_ERROR	((char*)"ERROR")	/* Return status, error */
-
-#endif /* _ASTERISK_OSP_H */

-- 
To view, visit https://gerrit.asterisk.org/8454
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I0a6c4debd7c9543b608520b1765abfa4fab7b2fd
Gerrit-Change-Number: 8454
Gerrit-PatchSet: 1
Gerrit-Owner: Corey Farrell <git at cfware.com>
Gerrit-Reviewer: Corey Farrell <git at cfware.com>
Gerrit-Reviewer: Jenkins2
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Kevin Harwell <kharwell at digium.com>
Gerrit-Reviewer: Richard Mudgett <rmudgett at digium.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20180311/5033f216/attachment.html>


More information about the asterisk-code-review mailing list