remove useless functino

benoitc · Apr 17, 2014 · 48a5a3f · 48a5a3f
1 parent 4c01822
commit 48a5a3f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 17 deletions.
diff --git a/src/hackney_bstr.erl b/src/hackney_bstr.erl
@@ -22,8 +22,6 @@
          alpha/2,
          word/2]).
 
--export([content_type/1]).
-
 -export([quoted_string/2]).
 
 to_binary(V) when is_list(V) ->
@@ -342,19 +340,6 @@ word(Data, Fun) ->
                         (Rest, Token) -> Fun(Rest, Token)
                 end).
 
-%% get content type
-%%
-%%
-content_type(Name) ->
-    case mimetypes:filename(Name) of
-        [CT | _] ->
-            CT;
-        CT when is_binary(CT) ->
-            CT
-    end.
-
-
-
 -spec quoted_string(binary(), fun()) -> any().
 quoted_string(<< $", Rest/binary >>, Fun) ->
         quoted_string(Rest, Fun, <<>>).

diff --git a/src/hackney_multipart.erl b/src/hackney_multipart.erl
@@ -226,7 +226,7 @@ mp_file_header({file, Path, ExtraHeaders}, Boundary) ->
                     {<<"filename">>, <<"\"", FName/binary, "\"">>}]},
     mp_file_header({file, Path, Disposition, ExtraHeaders}, Boundary);
 mp_file_header({file, Path, {Disposition, Params}, ExtraHeaders}, Boundary) ->
-    CType = hackney_bstr:content_type(Path),
+    CType = hackney_mimetypes:filename(Path),
     Len = filelib:file_size(Path),
     Headers = [{<<"Content-Disposition">>, Disposition, Params},
                {<<"Content-Type">>, CType},
@@ -247,7 +247,7 @@ mp_data_header({Name, Len, ExtraHeaders}, Boundary) ->
                                       <<"\"", Name/binary, "\"">>}]},
     mp_data_header({Name, Len, Disposition, ExtraHeaders}, Boundary);
 mp_data_header({Name, Len, {Disposition, Params}, ExtraHeaders}, Boundary) ->
-    CType = hackney_bstr:content_type(Name),
+    CType = hackney_mimetypes:filename(Name),
     Headers = [{<<"Content-Disposition">>, Disposition, Params},
                {<<"Content-Type">>, CType},
                {<<"Content-Length">>, Len}] ++ ExtraHeaders,