This week only. Pastebin PRO Accounts Christmas Special! Don't miss out!Want more features on Pastebin? Sign Up, it's FREE!
Guest

Untitled

By: a guest on Feb 10th, 2010  |  syntax: None  |  size: 1.03 KB  |  views: 55  |  expires: Never
download  |  raw  |  embed  |  report abuse  |  print
Text below is selected. Please press Ctrl+C to copy to your clipboard. (⌘+C on Mac)
  1. arvdr:/usr/src/vdr/PLUGINS/src/streamdev# cat streamdev-cvs221109-AddFemonV1.diff | patch -p1
  2. patching file server/connectionVTP.c
  3. Hunk #1 succeeded at 8 (offset 1 line).
  4. Hunk #2 succeeded at 735 (offset 23 lines).
  5. Hunk #3 succeeded at 848 (offset 23 lines).
  6. Hunk #4 FAILED at 867.
  7. Hunk #5 succeeded at 924 (offset 23 lines).
  8. Hunk #6 succeeded at 1379 (offset 10 lines).
  9. 1 out of 6 hunks FAILED -- saving rejects to file server/connectionVTP.c.rej
  10. patching file server/connectionVTP.h
  11. Hunk #1 succeeded at 13 with fuzz 2 (offset 2 lines).
  12. Hunk #2 succeeded at 40 (offset 3 lines).
  13. Hunk #3 succeeded at 85 (offset 11 lines).
  14. patching file services/femonservice.h
  15.  
  16.  
  17. connectionVTP.c.rej
  18.  
  19. ***************
  20. *** 768,773 ****
  21.   <---->delete m_LSTCHandler;
  22.   <---->delete m_LSTEHandler;
  23.   <---->delete m_LSTRHandler;
  24.   <---->delete m_RecPlayer;
  25.   }
  26. ..
  27. --- 867,873 ----
  28.   <---->delete m_LSTCHandler;
  29.   <---->delete m_LSTEHandler;
  30.   <---->delete m_LSTRHandler;
  31. + <---->delete m_LSTQHandler;
  32.   <---->delete m_RecPlayer;
  33.   }
clone this paste RAW Paste Data