Home Explore Help
Sign In
dfanfdsanfdsa
/
ood-ports-lbsd-fork1
forked from jimmy/ood-ports-lbsd
Watch 1
Star 0
Fork 0
Files
Branch: master
Branches Tags
ood-ports-lb...
/
audio
/
mt-daapd
/
patches
/
patch-src_daap_c

patch-src_daap_c 3.0 KB
Permalink History Raw

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485 
  1. $OpenBSD: patch-src_daap_c,v 1.1 2008/07/18 14:29:42 naddy Exp $
    2. 

  2. --- src/daap.c.orig	Sat Apr 19 15:17:23 2008
    3. 

  3. +++ src/daap.c	Fri Jul  4 10:17:01 2008
    4. 

  4. @@ -175,7 +175,7 @@ int daap_add_mdcl(DAAP_BLOCK *root, char *tag, char *n
    5. 

  5.  
    6. 

  6.      mdcl=daap_add_empty(root,"mdcl");
    7. 

  7.      if(mdcl) {
    8. 

  8. -	g=(int)daap_add_string(mdcl,"mcnm",tag);
    9. 

  9. +	g = !!daap_add_string(mdcl,"mcnm",tag);
    10. 

  10.  	g = g && daap_add_string(mdcl,"mcna",name);
    11. 

  11.  	g = g && daap_add_short(mdcl,"mcty",number);
    12. 

  12.      }
    13. 

  13. @@ -202,7 +202,7 @@ DAAP_BLOCK *daap_response_content_codes(void) {
    14. 

  14.  
    15. 

  15.      root=daap_add_empty(NULL,"mccr");
    16. 

  16.      if(root) {
    17. 

  17. -	g = (int)daap_add_int(root,"mstt",200);
    18. 

  18. +	g = !!daap_add_int(root,"mstt",200);
    19. 

  19.  
    20. 

  20.  	while(current->type) {
    21. 

  21.  	    g = g && daap_add_mdcl(root,current->tag,current->description,
    22. 

  22. @@ -235,7 +235,7 @@ DAAP_BLOCK *daap_response_login(char *hostname) {
    23. 

  23.  
    24. 

  24.      root=daap_add_empty(NULL,"mlog");
    25. 

  25.      if(root) {
    26. 

  26. -	g = (int)daap_add_int(root,"mstt",200);
    27. 

  27. +	g = !!daap_add_int(root,"mstt",200);
    28. 

  28.  	session=config_get_next_session();
    29. 

  29.  	g = g && daap_add_int(root,"mlid",session);
    30. 

  30.      }
    31. 

  31. @@ -437,7 +437,7 @@ DAAP_BLOCK *daap_response_songlist(char* metaStr, char
    32. 

  32.  
    33. 

  33.      root=daap_add_empty(NULL,"adbs");
    34. 

  34.      if(root) {
    35. 

  35. -	g = (int)daap_add_int(root,"mstt",200);
    36. 

  36. +	g = !!daap_add_int(root,"mstt",200);
    37. 

  37.  	g = g && daap_add_char(root,"muty",0);
    38. 

  38.  	g = g && daap_add_int(root,"mtco",0);
    39. 

  39.  	g = g && daap_add_int(root,"mrco",0);
    40. 

  40. @@ -630,7 +630,7 @@ DAAP_BLOCK *daap_response_update(int fd, int clientver
    41. 

  41.  
    42. 

  42.      root=daap_add_empty(NULL,"mupd");
    43. 

  43.      if(root) {
    44. 

  44. -	g = (int)daap_add_int(root,"mstt",200);
    45. 

  45. +	g = !!daap_add_int(root,"mstt",200);
    46. 

  46.  	/* theoretically, this would go up if the db changes? */
    47. 

  47.  	g = g && daap_add_int(root,"musr",db_version());
    48. 

  48.      }
    49. 

  49. @@ -661,7 +661,7 @@ DAAP_BLOCK *daap_response_playlists(char *name) {
    50. 

  50.      
    51. 

  51.      root=daap_add_empty(NULL,"aply");
    52. 

  52.      if(root) {
    53. 

  53. -	g = (int)daap_add_int(root,"mstt",200);
    54. 

  54. +	g = !!daap_add_int(root,"mstt",200);
    55. 

  55.  	g = g && daap_add_char(root,"muty",0); 
    56. 

  56.  	g = g && daap_add_int(root,"mtco",1 + db_get_playlist_count());
    57. 

  57.  	g = g && daap_add_int(root,"mrco",1 + db_get_playlist_count());
    58. 

  58. @@ -731,7 +731,7 @@ DAAP_BLOCK *daap_response_dbinfo(char *name) {
    59. 

  59.      
    60. 

  60.      root=daap_add_empty(NULL,"avdb");
    61. 

  61.      if(root) {
    62. 

  62. -	g = (int)daap_add_int(root,"mstt",200);
    63. 

  63. +	g = !!daap_add_int(root,"mstt",200);
    64. 

  64.  	g = g && daap_add_char(root,"muty",0); 
    65. 

  65.  	g = g && daap_add_int(root,"mtco",1);
    66. 

  66.  	g = g && daap_add_int(root,"mrco",1);
    67. 

  67. @@ -788,7 +788,7 @@ DAAP_BLOCK *daap_response_server_info(char *name, char
    68. 

  68.  	    apro = 2 << 16;
    69. 

  69.  	}
    70. 

  70.  
    71. 

  71. -	g = (int)daap_add_int(root,"mstt",200); /* result */
    72. 

  72. +	g = !!daap_add_int(root,"mstt",200); /* result */
    73. 

  73.  	g = g && daap_add_int(root,"mpro",mpro); /* dmap proto ? */
    74. 

  74.  	g = g && daap_add_int(root,"apro",apro); /* daap protocol */
    75. 

  75.  
    76. 

  76. @@ -889,7 +889,7 @@ DAAP_BLOCK *daap_response_playlist_items(unsigned int 
    77. 

  77.  
    78. 

  78.      root=daap_add_empty(NULL,"apso");
    79. 

  79.      if(root) {
    80. 

  80. -	g = (int)daap_add_int(root,"mstt",200);
    81. 

  81. +	g = !!daap_add_int(root,"mstt",200);
    82. 

  82.  	g = g && daap_add_char(root,"muty",0);
    83. 

  83.  	g = g && daap_add_int(root,"mtco",0);
    84. 

  84.  	g = g && daap_add_int(root,"mrco",0);
    85. 

  85.