- 
                Notifications
    You must be signed in to change notification settings 
- Fork 107
Added userData to allow user to store context variable. #34
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
          
     Open
      
      
            valkuc
  wants to merge
  13
  commits into
  Spritetm:master
  
    
      
        
          
  
    
      Choose a base branch
      
     
    
      
        
      
      
        
          
          
        
        
          
            
              
              
              
  
           
        
        
          
            
              
              
           
        
       
     
  
        
          
            
          
            
          
        
       
    
      
from
valkuc:master
  
      
      
   
  
    
  
  
  
 
  
      
    base: master
Could not load branches
            
              
  
    Branch not found: {{ refName }}
  
            
                
      Loading
              
            Could not load tags
            
            
              Nothing to show
            
              
  
            
                
      Loading
              
            Are you sure you want to change the base?
            Some commits from the old base branch may be removed from the timeline,
            and old review comments may become outdated.
          
          Conversation
  
    
      This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
      Learn more about bidirectional Unicode characters
    
  
  
    
    cgiData cannot be used for this purpose in templates, new userData can - it's dedicated for this.
| Example usage:  | 
Caused by buffer overflow.
SDK 2.x provides prototypes for some of the functions listed here, but with
slightly different argument types, leading to build errors:
In file included from ./include/esp8266.h:33:0,
                 from espfs/espfs.c:23:
./include/espmissingincludes.h:17:6: error: conflicting types for 'ets_install_putc1'
 void ets_install_putc1(void *routine);
      ^
In file included from ./include/esp8266.h:27:0,
                 from espfs/espfs.c:23:
/opt/esp-open-sdk/sdk/include/osapi.h:34:6: note: previous declaration of 'ets_install_putc1' was here
 void ets_install_putc1(void (*p)(char c));
      ^
In file included from ./include/esp8266.h:33:0,
                 from espfs/espfs.c:23:
./include/espmissingincludes.h:18:6: error: conflicting types for 'ets_isr_attach'
 void ets_isr_attach(int intr, void *handler, void *arg);
      ^
In file included from ./include/esp8266.h:24:0,
                 from espfs/espfs.c:23:
/opt/esp-open-sdk/sdk/include/ets_sys.h:67:6: note: previous declaration of 'ets_isr_attach' was here
 void ets_isr_attach(int i, ets_isr_t func, void *arg);
      ^
In file included from ./include/esp8266.h:33:0,
                 from espfs/espfs.c:23:
./include/espmissingincludes.h:28:8: error: conflicting types for 'ets_strlen'
 size_t ets_strlen(const char *s);
        ^
In file included from ./include/esp8266.h:27:0,
                 from espfs/espfs.c:23:
/opt/esp-open-sdk/sdk/include/osapi.h:47:5: note: previous declaration of 'ets_strlen' was here
 int ets_strlen(const char *s);
     ^
In file included from ./include/esp8266.h:33:0,
                 from espfs/espfs.c:23:
./include/espmissingincludes.h:29:5: error: conflicting types for 'ets_strncmp'
 int ets_strncmp(const char *s1, const char *s2, int len);
     ^
In file included from ./include/esp8266.h:27:0,
                 from espfs/espfs.c:23:
/opt/esp-open-sdk/sdk/include/osapi.h:48:5: note: previous declaration of 'ets_strncmp' was here
 int ets_strncmp(const char *s1, const char *s2, unsigned int n);
     ^
In file included from ./include/esp8266.h:33:0,
                 from espfs/espfs.c:23:
./include/espmissingincludes.h:32:6: error: conflicting types for 'ets_timer_arm_new'
 void ets_timer_arm_new(os_timer_t *a, int b, int c, int isMstimer);
      ^
In file included from ./include/esp8266.h:27:0,
                 from espfs/espfs.c:23:
/opt/esp-open-sdk/sdk/include/osapi.h:65:6: note: previous declaration of 'ets_timer_arm_new' was here
 void ets_timer_arm_new(os_timer_t *ptimer, uint32_t time, bool repeat_flag, bool ms_flag);
      ^
In file included from ./include/esp8266.h:33:0,
                 from espfs/espfs.c:23:
./include/espmissingincludes.h:40:6: error: conflicting types for 'uart_div_modify'
 void uart_div_modify(int no, unsigned int freq);
      ^
In file included from ./include/esp8266.h:28:0,
                 from espfs/espfs.c:23:
/opt/esp-open-sdk/sdk/include/user_interface.h:646:6: note: previous declaration of 'uart_div_modify' was here
 void uart_div_modify(uint8 uart_no, uint32 DivLatchValue);
      ^
In file included from ./include/esp8266.h:33:0,
                 from espfs/espfs.c:23:
./include/espmissingincludes.h:45:6: error: conflicting types for 'ets_delay_us'
 void ets_delay_us(int ms);
      ^
In file included from ./include/esp8266.h:27:0,
                 from espfs/espfs.c:23:
/opt/esp-open-sdk/sdk/include/osapi.h:33:6: note: previous declaration of 'ets_delay_us' was here
 void ets_delay_us(uint16_t us);
      ^
In file included from ./include/esp8266.h:33:0,
                 from espfs/espfs.c:23:
./include/espmissingincludes.h:57:7: error: conflicting types for 'pvPortMalloc'
 void *pvPortMalloc(size_t xWantedSize, const char *file, int line);
       ^
In file included from ./include/esp8266.h:26:0,
                 from espfs/espfs.c:23:
/home/peko/source/esp8266/esp-open-sdk/sdk//include/mem.h:38:7: note: previous declaration of 'pvPortMalloc' was here
 void *pvPortMalloc (size_t sz, const char *, unsigned);
       ^
In file included from ./include/esp8266.h:33:0,
                 from espfs/espfs.c:23:
./include/espmissingincludes.h:58:7: error: conflicting types for 'pvPortZalloc'
 void *pvPortZalloc(size_t, const char *file, int line);
       ^
In file included from ./include/esp8266.h:26:0,
                 from espfs/espfs.c:23:
/opt/esp-open-sdk/sdk/include/mem.h:40:7: note: previous declaration of 'pvPortZalloc' was here
 void *pvPortZalloc (size_t sz, const char *, unsigned);
       ^
In file included from ./include/esp8266.h:33:0,
                 from espfs/espfs.c:23:
./include/espmissingincludes.h:59:6: error: conflicting types for 'vPortFree'
 void vPortFree(void *ptr, const char *file, int line);
      ^
In file included from ./include/esp8266.h:26:0,
                 from espfs/espfs.c:23:
/opt/esp-open-sdk/sdk/include/mem.h:39:6: note: previous declaration of 'vPortFree' was here
 void vPortFree (void *p, const char *, unsigned);
      ^
Adjust the prototypes here to match the SDK to fix these issues.
Signed-off-by: Peter Korsgaard <[email protected]>
    …into jacmet-sdk-2x-support
cgiData cannot be used for this purpose in templates, new userData can - it's dedicated for this.
  
    Sign up for free
    to join this conversation on GitHub.
    Already have an account?
    Sign in to comment
  
      
  Add this suggestion to a batch that can be applied as a single commit.
  This suggestion is invalid because no changes were made to the code.
  Suggestions cannot be applied while the pull request is closed.
  Suggestions cannot be applied while viewing a subset of changes.
  Only one suggestion per line can be applied in a batch.
  Add this suggestion to a batch that can be applied as a single commit.
  Applying suggestions on deleted lines is not supported.
  You must change the existing code in this line in order to create a valid suggestion.
  Outdated suggestions cannot be applied.
  This suggestion has been applied or marked resolved.
  Suggestions cannot be applied from pending reviews.
  Suggestions cannot be applied on multi-line comments.
  Suggestions cannot be applied while the pull request is queued to merge.
  Suggestion cannot be applied right now. Please check back later.
  
    
  
    
cgiData cannot be used for this purpose in templates (because it's used internally), new userData can - it's dedicated for this.