Minor change to use Asterisk macros
authorRussell Bryant <russell@russellbryant.com>
Wed, 19 Mar 2008 04:09:55 +0000 (04:09 +0000)
committerRussell Bryant <russell@russellbryant.com>
Wed, 19 Mar 2008 04:09:55 +0000 (04:09 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@109841 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/http.c

index c3df5af..c0212d2 100644 (file)
@@ -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;
 }