From: Russell Bryant <russell@russellbryant.com>
Date: Wed, 19 Mar 2008 04:09:55 +0000 (+0000)
Subject: Minor change to use Asterisk macros
X-Git-Tag: 1.6.0-beta7~82
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f1d2a11aade12a7bd15e7dc21c754d2de7efc9d0;p=thirdparty%2Fasterisk.git

Minor change to use Asterisk macros


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@109841 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/http.c b/main/http.c
index c3df5af429..c0212d242f 100644
--- a/main/http.c
+++ b/main/http.c
@@ -136,13 +136,16 @@ static AST_RWLIST_HEAD_STATIC(uri_redirects, http_uri_redirect);
 static const char *ftype2mtype(const char *ftype, char *wkspace, int wkspacelen)
 {
 	int x;
+
 	if (ftype) {
-		for (x=0;x<sizeof(mimetypes) / sizeof(mimetypes[0]); x++) {
+		for (x = 0; x < ARRAY_LEN(mimetypes); x++) {
 			if (!strcasecmp(ftype, mimetypes[x].ext))
 				return mimetypes[x].mtype;
 		}
 	}
-	snprintf(wkspace, wkspacelen, "text/%s", ftype ? ftype : "plain");
+
+	snprintf(wkspace, wkspacelen, "text/%s", S_OR(ftype, "plain"));
+
 	return wkspace;
 }