Merge branch 'master' of ssh://git.dcc.fc.up.pt/yap-6.3
This commit is contained in:
		
							
								
								
									
										4
									
								
								C/save.c
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								C/save.c
									
									
									
									
									
								
							@@ -685,8 +685,8 @@ check_header(CELL *info, CELL *ATrail, CELL *AStack, CELL *AHeap USES_REGS)
 | 
				
			|||||||
  if (strcmp(pp, msg) != 0) {
 | 
					  if (strcmp(pp, msg) != 0) {
 | 
				
			||||||
    LOCAL_ErrorMessage = LOCAL_ErrorSay;
 | 
					    LOCAL_ErrorMessage = LOCAL_ErrorSay;
 | 
				
			||||||
    strncpy(LOCAL_ErrorMessage, "saved state ", MAX_ERROR_MSG_SIZE);
 | 
					    strncpy(LOCAL_ErrorMessage, "saved state ", MAX_ERROR_MSG_SIZE);
 | 
				
			||||||
    strncat(LOCAL_ErrorMessage, LOCAL_FileNameBuf, MAX_ERROR_MSG_SIZE);
 | 
					    strncat(LOCAL_ErrorMessage, LOCAL_FileNameBuf, MAX_ERROR_MSG_SIZE-1);
 | 
				
			||||||
    strncat(LOCAL_ErrorMessage, " failed to match version ID", MAX_ERROR_MSG_SIZE);
 | 
					    strncat(LOCAL_ErrorMessage, " failed to match version ID", MAX_ERROR_MSG_SIZE-1);
 | 
				
			||||||
    LOCAL_Error_TYPE = CONSISTENCY_ERROR;
 | 
					    LOCAL_Error_TYPE = CONSISTENCY_ERROR;
 | 
				
			||||||
    return FAIL_RESTORE;
 | 
					    return FAIL_RESTORE;
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 
 | 
				
			|||||||
 Submodule packages/archive updated: 4445c093d0...7984859c57
									
								
							 Submodule packages/odbc updated: 761bb9831f...d9a8cdd6ac
									
								
							
		Reference in New Issue
	
	Block a user